Fix button style and remove duplicate text (#837)

IB-6458 Signed-off-by: Raul Metsma <raul@metsma.ee>
open-eid · Oct 28, 2020 · 1b62429 · 1b62429
1 parent e334a0a
commit 1b62429
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 54 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,6 +21,8 @@ set_env( TSL_URL "https://ec.europa.eu/tools/lotl/eu-lotl.xml" CACHE STRING "TSL
 set_env( TSL_INCLUDE "EE" CACHE STRING "TSL list include in binary" )
 set_env( MOBILEID_URL "https://dd-mid.ria.ee/mid-api" CACHE STRING "URL for Mobile-ID" )
 set_env( SMARTID_URL "https://dd-sid.ria.ee/v1" CACHE STRING "URL for Smart-ID" )
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION YES)
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG NO)
 
 if(APPLE)
         set(BUNDLE_NAME qdigidoc4)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -131,7 +131,6 @@ target_link_libraries( ${PROGNAME}
 )
 set_target_properties(${PROGNAME} PROPERTIES
 	MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/Info.plist.cmake
-	INTERPROCEDURAL_OPTIMIZATION YES
 )
 target_include_directories(${PROGNAME} PRIVATE ${CMAKE_SOURCE_DIR} ${LIBDIGIDOCPP_INCLUDE_DIR} )
 target_compile_definitions(${PROGNAME} PRIVATE MOBILEID_URL="${MOBILEID_URL}" SMARTID_URL="${SMARTID_URL}" )

diff --git a/client/translations/en.ts b/client/translations/en.ts
@@ -1981,10 +1981,6 @@ and enter Smart-ID PIN2-code.</translation>
         <source>CHECK @EESTI.EE E-MAIL STATUS</source>
         <translation>CHECK @EESTI.EE E-MAIL STATUS</translation>
     </message>
-    <message>
-        <source>No official email redirects found. To send email to @eesti.ee, please enter your email address:</source>
-        <translation>No official email redirects found. To send email to @eesti.ee, please enter your email address:</translation>
-    </message>
     <message>
         <source>ACTIVATE REDIRECTION</source>
         <translation>ACTIVATE REDIRECTION</translation>
@@ -2015,6 +2011,10 @@ and enter Smart-ID PIN2-code.</translation>
         <source>For more detailed official email address forwarding, please visit &lt;a href=&apos;http://www.eesti.ee/en/&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;eesti.ee&lt;/span&gt;&lt;/a&gt;. &lt;a href=&apos;https://www.eesti.ee/en/using-the-state-portal#terms-of-the-official-email-service-of-eestiee&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;Terms&lt;/span&gt;&lt;/a&gt; of the official email service of eesti.ee.</source>
         <translation>For more detailed official email address forwarding, please visit &lt;a href=&apos;http://www.eesti.ee/en/&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;eesti.ee&lt;/span&gt;&lt;/a&gt;. &lt;a href=&apos;https://www.eesti.ee/en/using-the-state-portal#terms-of-the-official-email-service-of-eestiee&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;Terms&lt;/span&gt;&lt;/a&gt; of the official email service of eesti.ee.</translation>
     </message>
+    <message>
+        <source>To send email to @eesti.ee, please enter your email address:</source>
+        <translation>To send email to @eesti.ee, please enter your email address:</translation>
+    </message>
 </context>
 <context>
     <name>PageIcon</name>

diff --git a/client/translations/et.ts b/client/translations/et.ts
@@ -1981,10 +1981,6 @@ ja sisesta nutiseadmes Smart-ID PIN2-kood.</translation>
         <source>CHECK @EESTI.EE E-MAIL STATUS</source>
         <translation>KONTROLLI @EESTI.EE E-POSTI STAATUST</translation>
     </message>
-    <message>
-        <source>No official email redirects found. To send email to @eesti.ee, please enter your email address:</source>
-        <translation>Ühtegi ametlikku e-posti suunamist ei leitud.  @eesti.ee kirjade suunamiseks palun sisesta oma e-posti aadress:</translation>
-    </message>
     <message>
         <source>ACTIVATE REDIRECTION</source>
         <translation>AKTIVEERI SUUNAMINE</translation>
@@ -2015,6 +2011,10 @@ ja sisesta nutiseadmes Smart-ID PIN2-kood.</translation>
         <source>For more detailed official email address forwarding, please visit &lt;a href=&apos;http://www.eesti.ee/en/&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;eesti.ee&lt;/span&gt;&lt;/a&gt;. &lt;a href=&apos;https://www.eesti.ee/en/using-the-state-portal#terms-of-the-official-email-service-of-eestiee&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;Terms&lt;/span&gt;&lt;/a&gt; of the official email service of eesti.ee.</source>
         <translation>Täiuslikuma ametliku e-posti häälestamisvahendi leiad portaalist &lt;a href=&apos;http://www.eesti.ee/et/&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;eesti.ee&lt;/span&gt;&lt;/a&gt;. Eesti.ee ametliku postkasti teenuse &lt;a href=&apos;https://www.eesti.ee/et/riigiportaali-abi#eestiee-ametliku-postkasti-teenuse-kasutustingimused&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;kasutustingimused&lt;/span&gt;&lt;/a&gt;.</translation>
     </message>
+    <message>
+        <source>To send email to @eesti.ee, please enter your email address:</source>
+        <translation>@eesti.ee kirjade suunamiseks palun sisesta oma e-posti aadress:</translation>
+    </message>
 </context>
 <context>
     <name>PageIcon</name>

diff --git a/client/translations/ru.ts b/client/translations/ru.ts
@@ -1984,10 +1984,6 @@ and enter Smart-ID PIN2-code.</source>
         <source>CHECK @EESTI.EE E-MAIL STATUS</source>
         <translation>ПРОВЕРИТЬ СОСТОЯНИЕ @EESTI.EE E-ПОЧТЫ</translation>
     </message>
-    <message>
-        <source>No official email redirects found. To send email to @eesti.ee, please enter your email address:</source>
-        <translation>Не найдено официальных переадресаций электронной почты. Чтобы отправить электронное письмо на адрес @eesti.ee, введите ваш адрес электронной почты:</translation>
-    </message>
     <message>
         <source>ACTIVATE REDIRECTION</source>
         <translation>АКТИВИРОВАТЬ ПЕРЕАДРЕСАЦИЮ</translation>
@@ -2018,6 +2014,10 @@ and enter Smart-ID PIN2-code.</source>
         <source>For more detailed official email address forwarding, please visit &lt;a href=&apos;http://www.eesti.ee/en/&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;eesti.ee&lt;/span&gt;&lt;/a&gt;. &lt;a href=&apos;https://www.eesti.ee/en/using-the-state-portal#terms-of-the-official-email-service-of-eestiee&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;Terms&lt;/span&gt;&lt;/a&gt; of the official email service of eesti.ee.</source>
         <translation>Более подробную информацию по настройке пересылки электронной почты найдёте на портале &lt;a href=&apos;http://www.eesti.ee/ru/&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;eesti.ee&lt;/span&gt;&lt;/a&gt;. &lt;a href=&apos;https://www.eesti.ee/ru/v-pomos-polzovatelu#uslovia-ispolzovania-uslugi-oficialnogo-poctovogo-asika-eestiee&apos;&gt;&lt;span style=&apos;color: #006EB5; text-decoration: none; font-weight: 900;&apos;&gt;Условия использования&lt;/span&gt;&lt;/a&gt; услуги официального почтового ящика eesti.ee.</translation>
     </message>
+    <message>
+        <source>To send email to @eesti.ee, please enter your email address:</source>
+        <translation>Чтобы отправить электронное письмо на адрес @eesti.ee, введите ваш адрес электронной почты:</translation>
+    </message>
 </context>
 <context>
     <name>PageIcon</name>

diff --git a/client/widgets/OtherData.ui b/client/widgets/OtherData.ui
@@ -11,9 +11,30 @@
    </rect>
   </property>
   <property name="styleSheet">
-   <string notr="true">background-color: white;
+   <string notr="true">#OtherData {
+background-color: white;
 border: solid #DFE5E9;
-border-width: 1px 0px 0px 0px; </string>
+border-width: 1px 0px 0px 0px; 
+}
+QPushButton {
+padding: 6px 9px;
+border-radius: 2px;
+border: 1px solid #006EB5;
+color: #006EB5;
+background-color: #FFFFFF;
+max-width: 267px;
+}
+QPushButton:pressed {
+border: none;
+}
+QPushButton:hover:!pressed {
+border: 1px solid #008DCF;
+color: #008DCF;
+}
+QPushButton:disabled {
+border: 1px solid #BEDBED;
+color: #BEDBED;
+}</string>
   </property>
   <layout class="QVBoxLayout" name="OtherDataLayout">
    <property name="spacing">
@@ -41,18 +62,6 @@ color: #353739;</string>
    </item>
    <item>
     <widget class="QPushButton" name="btnCheckEMail">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>267</width>
-       <height>0</height>
-      </size>
-     </property>
      <property name="font">
       <font>
        <family>Roboto Condensed</family>
@@ -65,13 +74,6 @@ color: #353739;</string>
      <property name="accessibleName">
       <string extracomment="accessible">Check @eesti.ee e-mail status</string>
      </property>
-     <property name="styleSheet">
-      <string notr="true">QPushButton { padding: 6px 9px; border-radius: 2px; border: 1px solid #006EB5; color: #006EB5; background-color: #FFFFFF;}
-QPushButton:pressed {  border: none; background-color: #006EB5; color: #FFFFFF;}
-QPushButton:hover:!pressed { border: 1px solid #008DCF; color: #008DCF;}
-QPushButton:disabled { border: 1px solid #BEDBED; color: #BEDBED;};
-</string>
-     </property>
      <property name="text">
       <string>CHECK @EESTI.EE E-MAIL STATUS</string>
      </property>
@@ -108,7 +110,7 @@ color: #353739;</string>
 color: #353739;</string>
      </property>
      <property name="text">
-      <string>No official email redirects found. To send email to @eesti.ee, please enter your email address:</string>
+      <string>To send email to @eesti.ee, please enter your email address:</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -141,18 +143,6 @@ text-decoration: underline;
    </item>
    <item>
     <widget class="QPushButton" name="activate">
-     <property name="minimumSize">
-      <size>
-       <width>267</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>267</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <property name="font">
       <font>
        <family>Roboto Condensed</family>
@@ -165,13 +155,6 @@ text-decoration: underline;
      <property name="accessibleName">
       <string extracomment="accessible">Activate redirection</string>
      </property>
-     <property name="styleSheet">
-      <string notr="true">QPushButton { padding: 6px 9px; border-radius: 2px; border: 1px solid #006EB5; color: #006EB5; background-color: #FFFFFF;}
-QPushButton:pressed { border: 1px solid #41B6E6; color: #41B6E6;}
-QPushButton:hover:!pressed { border: 1px solid #008DCF; color: #008DCF;}
-QPushButton:disabled { border: 1px solid #BEDBED; color: #BEDBED;};
-</string>
-     </property>
      <property name="text">
       <string>ACTIVATE REDIRECTION</string>
      </property>