Clean up loginform UI

2 files changed, 9 insertions, 19 deletions

diff --git a/src/loginform.cpp b/src/loginform.cpp
index 885a567..a53c7ab 100644
--- a/src/loginform.cpp
+++ b/src/loginform.cpp
@@ -127,7 +127,7 @@ void LoginForm::initialize()
             ui->loginButton->setText(Settings::userSessionButtonText());
         }
         if (!Settings::guestSessionStartText().isEmpty()) {
-            ui->guestStartText->setText(Settings::guestSessionStartText());
+            ui->guestStartLabel->setText(Settings::guestSessionStartText());
         }
         if (!Settings::guestSessionStartButtonText().isEmpty()) {
             ui->guestStartButton->setText(Settings::guestSessionStartButtonText());
diff --git a/src/loginform.ui b/src/loginform.ui
index b74b68e..fcf7f6a 100644
--- a/src/loginform.ui
+++ b/src/loginform.ui
@@ -35,7 +35,7 @@ QLineEdit {
 	background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #aaa, stop:0.1 #eee, stop:1 #fff);
 }
 
-#hostnameLabel {
+#hostnameLabel, #guestStartLabel {
 	color: white;
 }
 
@@ -48,6 +48,7 @@ QComboBox,
 QPushButton {
     border: 1px solid #aaa;
     background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #ccc, stop:0.1 #bbb, stop:1 #888);
+	color: #000;
 }
 
 #messageLabel {
@@ -68,8 +69,9 @@ QComboBox::down-arrow {
 QComboBox QListView {
 	border: none;
 	background-color: rgb(200, 200, 200);
-   border-radius: 0;
+	border-radius: 0;
 	font-size: 12pt;
+	width: 160px;
 }
 
 QComboBox QAbstractItemView::item {
@@ -228,9 +230,6 @@ QComboBox QAbstractItemView::item {
               <bold>true</bold>
              </font>
             </property>
-            <property name="styleSheet">
-             <string notr="true">color: rgb(0, 0, 0);</string>
-            </property>
             <property name="text">
              <string>Gast-Login</string>
             </property>
@@ -248,13 +247,9 @@ QComboBox QAbstractItemView::item {
              <font>
               <pointsize>10</pointsize>
               <weight>75</weight>
-              <italic>false</italic>
               <bold>true</bold>
              </font>
             </property>
-            <property name="styleSheet">
-             <string notr="true">color: rgb(0, 0, 0);</string>
-            </property>
             <property name="text">
              <string>Campus-Login</string>
             </property>
@@ -293,7 +288,7 @@ QComboBox QAbstractItemView::item {
             <property name="font">
              <font>
               <family>Bitstream Vera Sans</family>
-              <pointsize>12</pointsize>
+              <pointsize>13</pointsize>
               <weight>75</weight>
               <bold>true</bold>
              </font>
@@ -335,7 +330,7 @@ QComboBox QAbstractItemView::item {
             <property name="font">
              <font>
               <family>Bitstream Vera Sans</family>
-              <pointsize>12</pointsize>
+              <pointsize>13</pointsize>
               <weight>75</weight>
               <bold>true</bold>
              </font>
@@ -380,20 +375,18 @@ QComboBox QAbstractItemView::item {
             </property>
             <property name="font">
              <font>
+              <pointsize>10</pointsize>
               <weight>75</weight>
               <bold>true</bold>
              </font>
             </property>
-            <property name="styleSheet">
-             <string notr="true">color: rgb(0, 0, 0);</string>
-            </property>
             <property name="text">
              <string>Starten einer Gast-Sitzung</string>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
-           <widget class="QLabel" name="guestStartText">
+           <widget class="QLabel" name="guestStartLabel">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -412,9 +405,6 @@ QComboBox QAbstractItemView::item {
               <italic>true</italic>
              </font>
             </property>
-            <property name="styleSheet">
-             <string notr="true">color: rgb(255, 255, 255);</string>
-            </property>
             <property name="text">
              <string>Wenn Sie sich als Gast einloggen, dürfen Sie nur die Webseiten der Universtität Freiburg besuchen.</string>
             </property>