Tech tree button (to open Onetech in browser) on login screen. Better…

… tool tips for several buttons. Fixes #647
hetuw · Jul 3, 2020 · ae1d0c4 · ae1d0c4
1 parent c6cf7a9
commit ae1d0c4
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 1 deletion.
diff --git a/documentation/changeLog.txt b/documentation/changeLog.txt
@@ -14,6 +14,10 @@ Version 346   ???
 
 --Category editor preserves index, if possible, when switching categories.
 
+--Tech tree button (to open Onetech in browser) on login screen.  Better tool
+  tips for several buttons.  Fixes #647
+
+
 
 
 Server Fixes

diff --git a/gameSource/ExistingAccountPage.cpp b/gameSource/ExistingAccountPage.cpp
@@ -58,7 +58,8 @@ ExistingAccountPage::ExistingAccountPage()
           mLoginButton( mainFont, 400, 0, translate( "loginButton" ) ),
           mFriendsButton( mainFont, 400, -80, translate( "friendsButton" ) ),
           mGenesButton( mainFont, 550, 0, translate( "genesButton" ) ),
-          mFamilyTreesButton( mainFont, 400, -160, translate( "familyTrees" ) ),
+          mFamilyTreesButton( mainFont, 320, -160, translate( "familyTrees" ) ),
+          mTechTreeButton( mainFont, 550, -160, translate( "techTree" ) ),
           mClearAccountButton( mainFont, 400, -280, 
                                translate( "clearAccount" ) ),
           mCancelButton( mainFont, -400, -280, 
@@ -97,6 +98,7 @@ ExistingAccountPage::ExistingAccountPage()
     setButtonStyle( &mFriendsButton );
     setButtonStyle( &mGenesButton );
     setButtonStyle( &mFamilyTreesButton );
+    setButtonStyle( &mTechTreeButton );
     setButtonStyle( &mClearAccountButton );
     setButtonStyle( &mCancelButton );
     setButtonStyle( &mSettingsButton );
@@ -118,6 +120,7 @@ ExistingAccountPage::ExistingAccountPage()
     addComponent( &mFriendsButton );
     addComponent( &mGenesButton );
     addComponent( &mFamilyTreesButton );
+    addComponent( &mTechTreeButton );
     addComponent( &mClearAccountButton );
     addComponent( &mCancelButton );
     addComponent( &mSettingsButton );
@@ -137,6 +140,7 @@ ExistingAccountPage::ExistingAccountPage()
     mFriendsButton.addActionListener( this );
     mGenesButton.addActionListener( this );
     mFamilyTreesButton.addActionListener( this );
+    mTechTreeButton.addActionListener( this );
     mClearAccountButton.addActionListener( this );
 
     mCancelButton.addActionListener( this );
@@ -163,6 +167,12 @@ ExistingAccountPage::ExistingAccountPage()
     mLoginButton.setMouseOverTip( translate( "saveTip" ) );
     mClearAccountButton.setMouseOverTip( translate( "clearAccountTip" ) );
 
+    mFriendsButton.setMouseOverTip( translate( "friendsTip" ) );
+    mGenesButton.setMouseOverTip( translate( "genesTip" ) );
+    mFamilyTreesButton.setMouseOverTip( translate( "familyTreesTip" ) );
+    mTechTreeButton.setMouseOverTip( translate( "techTreeTip" ) );
+
+
     int reviewPosted = SettingsManager::getIntSetting( "reviewPosted", 0 );
 
     if( reviewPosted ) {
@@ -428,6 +438,14 @@ void ExistingAccountPage::actionPerformed( GUIComponent *inTarget ) {
             }
         delete [] url;
         }
+    else if( inTarget == &mTechTreeButton ) {
+        char *url = SettingsManager::getStringSetting( "techTreeURL", "" );
+
+        if( strcmp( url, "" ) != 0 ) {
+            launchURL( url );
+            }
+        delete [] url;
+        }
     else if( inTarget == &mViewAccountButton ) {
         if( mHideAccount ) {
             mViewAccountButton.setLabelText( translate( "hide" ) );

diff --git a/gameSource/ExistingAccountPage.h b/gameSource/ExistingAccountPage.h
@@ -63,6 +63,7 @@ class ExistingAccountPage : public GamePage, public ActionListener {
         TextButton mFriendsButton;
         TextButton mGenesButton;
         TextButton mFamilyTreesButton;
+        TextButton mTechTreeButton;
         TextButton mClearAccountButton;
         TextButton mCancelButton;
 

diff --git a/gameSource/languages/English.txt b/gameSource/languages/English.txt
@@ -46,6 +46,7 @@ atSignTip "INSERT '@' SIGN (INTL KEYBOARDS)"
 loginButton "LOGIN"
 friendsButton "FRIENDS"
 familyTrees "FAMILY TREES"
+techTree "TECH"
 genesButton "GENES"
 geneticHistoryButton "GENETIC HISTORY"
 
@@ -91,6 +92,12 @@ submit "SUBMIT"
 saveTip "LOGIN AND STORE DETAILS LOCALLY"
 clearAccountTip "DELETES ACCOUNT DETAILS FROM DISK"
 
+friendsTip "GET BORN WITH FRIENDS"
+genesTip "GENETIC SCORE DETAILS"
+
+familyTreesTip "OPEN FAMILY TREES IN WEB BROWSER"
+techTreeTip "OPEN TECH TREE IN WEB BROWSER"
+
 
 accountKey "KEY:"
 paste "PASTE"

diff --git a/gameSource/settings/techTreeURL.ini b/gameSource/settings/techTreeURL.ini
@@ -0,0 +1 @@
+http://onetech.info