[Scummvm-cvs-logs] SF.net SVN: scummvm:[41898] tools/branches/gsoc2009-gui/gui

[Remere at users.sourceforge.net]

Revision: 41898
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41898&view=rev
Author:   Remere
Date:     2009-06-26 00:25:59 +0000 (Fri, 26 Jun 2009)

Log Message:
-----------
*Made it possibly to set line label
*Removed redundant use of _topframe->

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/gui/main.cpp
    tools/branches/gsoc2009-gui/gui/pages.cpp

Modified: tools/branches/gsoc2009-gui/gui/main.cpp
===================================================================
--- tools/branches/gsoc2009-gui/gui/main.cpp	2009-06-26 00:12:19 UTC (rev 41897)
+++ tools/branches/gsoc2009-gui/gui/main.cpp	2009-06-26 00:25:59 UTC (rev 41898)
@@ -186,6 +186,7 @@
 	enableNext(true);
 	enablePrevious(true);
 	showFinish(false);
+	setLineLabel(wxT("ScummVM Tools"));
 }
 
 void WizardButtons::setPage(WizardPage *current, wxWindow *panel) {
@@ -198,6 +199,10 @@
 	_currentPage->updateButtons(_currentPanel, this);
 }
 
+void WizardButtons::setLineLabel(wxString label) {
+	_linetext->SetLabel(label);
+}
+
 void WizardButtons::enableNext(bool enable) {
 	_next->Enable(enable);
 }

Modified: tools/branches/gsoc2009-gui/gui/pages.cpp
===================================================================
--- tools/branches/gsoc2009-gui/gui/pages.cpp	2009-06-26 00:12:19 UTC (rev 41897)
+++ tools/branches/gsoc2009-gui/gui/pages.cpp	2009-06-26 00:25:59 UTC (rev 41898)
@@ -145,13 +145,13 @@
 	wxString selected_option = static_cast<wxRadioBox *>(panel->FindWindowByName(wxT("ChooseActivity")))->GetStringSelection().Lower();
 	if(selected_option.Find(wxT("extract")) != wxNOT_FOUND) {
 		// extract
-		_topframe->switchPage(new ChooseExtractionPage(_topframe));
+		switchPage(new ChooseExtractionPage(_topframe));
 	} else if(selected_option.Find(wxT("advanced")) != wxNOT_FOUND) {
 		// advanced
-		_topframe->switchPage(new ChooseToolPage(_topframe));
+		switchPage(new ChooseToolPage(_topframe));
 	} else {
 		// compress
-		_topframe->switchPage(new ChooseCompressionPage(_topframe));
+		switchPage(new ChooseCompressionPage(_topframe));
 	}
 }
 
@@ -195,7 +195,7 @@
 }
 
 void ChooseCompressionPage::onNext(wxWindow *panel) {
-	_topframe->switchPage(new ChooseInOutPage(_topframe));
+	switchPage(new ChooseInOutPage(_topframe));
 }
 
 // Page to choose what game files to extract, 
@@ -238,7 +238,7 @@
 }
 
 void ChooseExtractionPage::onNext(wxWindow *panel) {
-	_topframe->switchPage(new ChooseInOutPage(_topframe));
+	switchPage(new ChooseInOutPage(_topframe));
 }
 
 // Page to choose ANY tool to use
@@ -279,7 +279,7 @@
 }
 
 void ChooseToolPage::onNext(wxWindow *panel) {
-	_topframe->switchPage(new ChooseInOutPage(_topframe));
+	switchPage(new ChooseInOutPage(_topframe));
 }
 
 // Page to choose input and output directory or file
@@ -382,7 +382,9 @@
 
 void ChooseInOutPage::onNext(wxWindow *panel) {
 	if(_configuration.compressing)
-		_topframe->switchPage(new ChooseAudioFormatPage(_topframe));
+		switchPage(new ChooseAudioFormatPage(_topframe));
+	else
+		; // Go to confirm page, nothing more to query
 }
 
 // Page to choose input and output directory or file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.