[OMPT-svn-commit] SF.net SVN: modplug:[1036] trunk/OpenMPT

[<sag...@us...>]

Revision: 1036
          http://modplug.svn.sourceforge.net/modplug/?rev=1036&view=rev
Author:   saga-games
Date:     2011-09-17 17:19:58 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
[Fix] Updated another unmo3-related URL in the installer
[Mod] Close Dialog: Added buttons "Save All" and "Save None" for quicker navigation

Modified Paths:
--------------
    trunk/OpenMPT/installer/install-unmo3-free-itd.iss
    trunk/OpenMPT/mptrack/CloseMainDialog.cpp
    trunk/OpenMPT/mptrack/CloseMainDialog.h
    trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/installer/install-unmo3-free-itd.iss
===================================================================
--- trunk/OpenMPT/installer/install-unmo3-free-itd.iss	2011-09-17 15:59:05 UTC (rev 1035)
+++ trunk/OpenMPT/installer/install-unmo3-free-itd.iss	2011-09-17 17:19:58 UTC (rev 1036)
@@ -47,7 +47,7 @@
             if(IsTaskSelected('downloadmo3')) then
             begin
             	  ITD_AddFile('http://openmpt.org/files/unmo3/2.4.0.3/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
-            	  ITD_AddMirror('ftp://ftp.untergrund.net/users/sagamusix/openmpt/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
+            	  ITD_AddMirror('ftp://ftp.untergrund.net/users/sagamusix/openmpt/archive/unmo3/2.4.0.3/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
             end else
           	begin
                 ITD_ClearFiles();

Modified: trunk/OpenMPT/mptrack/CloseMainDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CloseMainDialog.cpp	2011-09-17 15:59:05 UTC (rev 1035)
+++ trunk/OpenMPT/mptrack/CloseMainDialog.cpp	2011-09-17 17:19:58 UTC (rev 1036)
@@ -16,8 +16,8 @@
 
 
 BEGIN_MESSAGE_MAP(CloseMainDialog, CDialog)
-	ON_LBN_SELCHANGE(IDC_LIST1,		OnSelectionChanged)
-	ON_COMMAND(IDC_BUTTON1,			OnSwitchSelection)
+	ON_COMMAND(IDC_BUTTON1,			OnSaveAll)
+	ON_COMMAND(IDC_BUTTON2,			OnSaveNone)
 	ON_COMMAND(IDC_CHECK1,			OnSwitchFullPaths)
 END_MESSAGE_MAP()
 
@@ -74,9 +74,6 @@
 	{
 		// No modified documents...
 		OnOK();
-	} else
-	{
-		UpdateSwitchButtonState();
 	}
 
 	return TRUE;
@@ -120,39 +117,22 @@
 }
 
 
-void CloseMainDialog::OnSelectionChanged()
-//----------------------------------------
+void CloseMainDialog::OnSaveAll()
+//-------------------------------
 {
-	UpdateSwitchButtonState();
+	m_List.SelItemRange(TRUE, 0, m_List.GetCount() - 1);
+	OnOK();
 }
 
 
-// Switch between save all/none
-void CloseMainDialog::OnSwitchSelection()
-//---------------------------------------
+void CloseMainDialog::OnSaveNone()
+//--------------------------------
 {
-	const int count = m_List.GetCount();
-	// If all items are selected, deselect them all; Else, select all items.
-	const BOOL action = (m_List.GetSelCount() == count) ? FALSE : TRUE;
-	for(int i = 0; i < count; i++)
-	{
-		m_List.SetSel(i, action);
-	}
-	UpdateSwitchButtonState();
+	m_List.SelItemRange(FALSE, 0, m_List.GetCount() - 1);
+	OnOK();
 }
 
 
-// Update Select none/all button
-void CloseMainDialog::UpdateSwitchButtonState()
-//---------------------------------------------
-{
-	CString text = (m_List.GetSelCount() == m_List.GetCount()) ? "Se&lect none" : "Se&lect all";
-	((CButton *)GetDlgItem(IDC_BUTTON1))->SetWindowText(text);
-	text = (m_List.GetSelCount() > 0) ? "&Save selected" : "Cl&ose";
-	((CButton *)GetDlgItem(IDOK))->SetWindowText(text);
-}
-
-
 // Switch between full path / filename only display
 void CloseMainDialog::OnSwitchFullPaths()
 //---------------------------------------

Modified: trunk/OpenMPT/mptrack/CloseMainDialog.h
===================================================================
--- trunk/OpenMPT/mptrack/CloseMainDialog.h	2011-09-17 15:59:05 UTC (rev 1035)
+++ trunk/OpenMPT/mptrack/CloseMainDialog.h	2011-09-17 17:19:58 UTC (rev 1036)
@@ -19,7 +19,6 @@
 	CListBox m_List;
 
 	CString FormatTitle(const CModDoc *pModDoc, bool fullPath);
-	void UpdateSwitchButtonState();
 
 public:
 	CloseMainDialog() : CDialog(IDD_CLOSEDOCUMENTS) { };
@@ -31,8 +30,9 @@
 	virtual void OnOK();
 	virtual void OnCancel();
 
-	afx_msg void OnSelectionChanged();
-	afx_msg void OnSwitchSelection();
+	afx_msg void OnSaveAll();
+	afx_msg void OnSaveNone();
+
 	afx_msg void OnSwitchFullPaths();
 
 	DECLARE_MESSAGE_MAP()

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2011-09-17 15:59:05 UTC (rev 1035)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2011-09-17 17:19:58 UTC (rev 1036)
@@ -211,11 +211,12 @@
 CAPTION "Save modified files"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "&OK",IDOK,300,138,66,14
+    DEFPUSHBUTTON   "Save &Selected",IDOK,300,138,66,14
     PUSHBUTTON      "&Cancel",IDCANCEL,300,157,66,14
     LISTBOX         IDC_LIST1,6,6,288,168,LBS_SORT | LBS_MULTIPLESEL | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Show &full paths",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,180,252,12
-    PUSHBUTTON      "&Select none",IDC_BUTTON1,300,12,66,14
+    PUSHBUTTON      "Save &All",IDC_BUTTON1,300,90,66,14
+    PUSHBUTTON      "Save &None",IDC_BUTTON2,300,108,66,14
 END
 
 

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