Changeset 26 for trunk/Classes/game_preferences_display.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/game_preferences_display.cpp (modified) (5 diffs)

trunk/Classes/game_preferences_display.cpp

@@ -155 +155 @@
       show_grid_button_(disp.video(), _("Show Grid"), gui::button::TYPE_CHECK),
       save_replays_button_(disp.video(), _("Save Replay on SP/MP Victory or MP Defeat"), gui::button::TYPE_CHECK),
-      delete_saves_button_(disp.video(), _("Delete Auto-Saves on SP/MP Victory or MP Defeat"), gui::button::TYPE_CHECK),
+      delete_saves_button_(disp.video(), _("Delete Auto-Saves on SP/MP Victory"), gui::button::TYPE_CHECK),
       show_lobby_joins_button1_(disp.video(), _("Do Not Show Lobby Joins"), gui::button::TYPE_CHECK),
       show_lobby_joins_button2_(disp.video(), _("Show Lobby Joins Of Friends Only"), gui::button::TYPE_CHECK),
@@ -510 +510 @@
     // General tab
 #ifdef __IPHONEOS__
-    const int bottom_row_y = 245;
+    #ifdef __IPAD__
+        const int bottom_row_y = 500;
+    #else
+        const int bottom_row_y = 245;
+    #endif
 
     int ypos = rect.y + top_border;
@@ -661 +665 @@
     ypos += short_interline; show_lobby_joins_button3_.set_location(rect.x, ypos);
 
-    friends_list_button_.set_location(rect.x, bottom_row_y - friends_list_button_.height());
+    friends_list_button_.set_location(rect.x, ypos+short_interline); //bottom_row_y - friends_list_button_.height());
 
     mp_server_search_button_.set_location(rect.x + horizontal_padding + friends_list_button_.width(), bottom_row_y - mp_server_search_button_.height());
@@ -682 +686 @@
 
     friends_add_friend_button_.set_location(friends_xpos,ypos);
-    ypos += short_interline+3; friends_add_ignore_button_.set_location(friends_xpos,ypos);
-    ypos += short_interline+3; friends_remove_button_.set_location(friends_xpos,ypos);
+    ypos += friends_add_friend_button_.height() + 3; friends_add_ignore_button_.set_location(friends_xpos,ypos);
+    ypos += friends_add_friend_button_.height() + 3; friends_remove_button_.set_location(friends_xpos,ypos);
     friends_back_button_.set_location(rect.x, bottom_row_y - friends_back_button_.height());
 
@@ -1166 +1170 @@
     std::string const pre = IMAGE_PREFIX + std::string("icons/icon-");
     char const sep = COLUMN_SEPARATOR;
-    items.push_back(pre + "general.png" + sep + sgettext("Prefs section^General"));
-    items.push_back(pre + "display.png" + sep + sgettext("Prefs section^Display"));
-    items.push_back(pre + "music.png" + sep + sgettext("Prefs section^Sound"));
-    items.push_back(pre + "multiplayer.png" + sep + sgettext("Prefs section^Multiplayer"));
+    items.push_back(pre + "general.png");// + sep + sgettext("Prefs section^General"));
+    items.push_back(pre + "display.png");// + sep + sgettext("Prefs section^Display"));
+    items.push_back(pre + "music.png");// + sep + sgettext("Prefs section^Sound"));
+    items.push_back(pre + "multiplayer.png");// + sep + sgettext("Prefs section^Multiplayer"));
 //  items.push_back(pre + "advanced.png" + sep + sgettext("Advanced section^Advanced"));