Bugfix: Settings help dialog has wrong names in buttons because changes have been...

diff --git a/Client/Graphics/settingsDialog.png b/Client/Graphics/settingsDialog.png
index 8c9c2a3..35bcbe4 100644 (file)
Binary files a/Client/Graphics/settingsDialog.png and b/Client/Graphics/settingsDialog.png differ

diff --git a/Client/helpsettingsdialog.ui b/Client/helpsettingsdialog.ui
index 5eba07a..1f1da59 100644 (file)
--- a/Client/helpsettingsdialog.ui
+++ b/Client/helpsettingsdialog.ui
@@ -120,14 +120,14 @@ your registering will be confirmed.   </string>
    <property name="text">
     <string>2. After succesful registering you need
 to put username and password to the
    <property name="text">
     <string>2. After succesful registering you need
 to put username and password to the

-fields and press Set user button. After
+fields and press Log in -button. After

 that you are logged in and can send
 own results to the server.
 
 NOTE: If you are registered your user-
 name before you just need to set your
 username and password in to the Set user
 that you are logged in and can send
 own results to the server.
 
 NOTE: If you are registered your user-
 name before you just need to set your
 username and password in to the Set user

-fields and press Set user -button.</string>
+fields and press Log in -button.</string>

    </property>
   </widget>
  </widget>
    </property>
   </widget>
  </widget>

diff --git a/Client/mainwindow.cpp b/Client/mainwindow.cpp
index bc32c76..c01329c 100644 (file)
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@ -41,7 +41,7 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(httpClient->myXmlreader, SIGNAL(receivedTop10List()), this, SLOT(showTop10()));    
 
     welcomeDialog = new WelcomeDialog;
     connect(httpClient->myXmlreader, SIGNAL(receivedTop10List()), this, SLOT(showTop10()));    
 
     welcomeDialog = new WelcomeDialog;

-    //welcomeDialog->show();
+    welcomeDialog->show();

 
     this->setUsernameToMainPanel();
 
 
     this->setUsernameToMainPanel();