[Performous-commit] Tapio Vierros : Tighter instrument menu layout.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: cac8b33763a04e8ea354472389628c0c9573b300

Author: Tapio Vierros <tap...@gm...>
Date:   Thu Jul  8 23:26:43 2010 +0300

Tighter instrument menu layout.

---

 game/dancegraph.cc      |    6 +++---
 game/guitargraph.cc     |    8 ++++----
 game/instrumentgraph.cc |   11 +++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index ba829d9..6a09a19 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -127,9 +127,9 @@ void DanceGraph::setupJoinMenu() {
 }
 
 void DanceGraph::updateJoinMenu() {
-	std::string s(" (");
-	m_trackComment = _("Select track to play") + s + getTrack() + ")";
-	m_difficultyComment =  _("Select difficulty level") + s + getDifficultyString() + ")";
+	std::string s("\n (");
+	m_trackComment = _("Select track") + s + getTrack() + ")";
+	m_difficultyComment =  _("Select difficulty") + s + getDifficultyString() + ")";
 	m_selectedTrack = ConfigItem(getTrack());
 	m_selectedDifficulty = ConfigItem(m_level);
 }
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 48e2a72..6898f31 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -155,11 +155,11 @@ void GuitarGraph::setupJoinMenu() {
 }
 
 void GuitarGraph::updateJoinMenu() {
-	std::string s(" (");
+	std::string s("\n (");
 	std::string le = m_leftymode.b() ? _("ON") : _("OFF");
-	m_trackComment = _("Select track to play") + s + getTrack() + ")";
-	m_difficultyComment =  _("Select difficulty level") + s + getDifficultyString() + ")";
-	m_leftyComment = _("Toggle left-handed mode") + s + le + ")";
+	m_trackComment = _("Select track") + s + getTrack() + ")";
+	m_difficultyComment =  _("Select difficulty") + s + getDifficultyString() + ")";
+	m_leftyComment = _("Toggle lefty-mode") + s + le + ")";
 	m_selectedTrack = ConfigItem(getTrack());
 	m_selectedDifficulty = ConfigItem(m_level);
 }
diff --git a/game/instrumentgraph.cc b/game/instrumentgraph.cc
index 7dcc6bc..ce67f74 100644
--- a/game/instrumentgraph.cc
+++ b/game/instrumentgraph.cc
@@ -31,10 +31,9 @@ InstrumentGraph::InstrumentGraph(Audio& audio, Song const& song, input::DevType
 
 void InstrumentGraph::setupPauseMenu() {
 	m_menu.clear();
-	// TODO: Replace with options that actually do something
 	m_menu.add(MenuOption(_("Resume"), _("Back to performing!")));
-	//m_menu.add(MenuOption(_("Pause"), _("Toggle pause"), &InstrumentGraph::togglePause));
-	m_menu.add(MenuOption(_("Restart"), _("Start the song from the beginning")));
+	// TODO: Implement restart
+	//m_menu.add(MenuOption(_("Restart"), _("Start the song\nfrom the beginning")));
 	m_menu.add(MenuOption(_("Quit"), _("Exit to song browser"), "Songs"));
 }
 
@@ -55,8 +54,8 @@ void InstrumentGraph::toggleMenu(bool forceopen) {
 
 void InstrumentGraph::drawMenu(double offsetX) {
 	if (m_menu.empty()) return;
-	float step = 0.075;
-	float y = -0.5 * m_menu.getOptions().size() * step;
+	float step = 0.05;
+	float y = -0.6 * m_menu.getOptions().size() * step;
 	// Some helper vars
 	ThemeInstrumentMenu& th = *m_menuTheme;
 	MenuOptions::const_iterator cur = static_cast<MenuOptions::const_iterator>(&m_menu.current());
@@ -75,7 +74,7 @@ void InstrumentGraph::drawMenu(double offsetX) {
 	if (cur->getComment() != "") {
 		//th.comment_bg.dimensions.middle().screenBottom(-0.2);
 		//th.comment_bg.draw();
-		th.comment.dimensions.middle(-0.15 + offsetX).screenBottom(-0.2);
+		th.comment.dimensions.middle(-0.1 + offsetX).screenBottom(-0.22);
 		th.comment.draw(cur->getComment());
 	}
 }