Subversion Repositories spk

Rev

Rev 182 | Rev 196 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 182 Rev 191
Line 279... Line 279...
279 
 
 279 
 
280 
			// add all none open items
 280 
			// add all none open items
281 
			for ( SStringList *str = m_pLoadedList->Head(); str; str = str->next )
 281 
			for ( SStringList *str = m_pLoadedList->Head(); str; str = str->next )
282 
			{
 282 
			{
283 
				// check if we have it open
 283 
				// check if we have it open
284 
				System::String ^sFile = SystemStringFromCyString(str->str.findreplace("/", "\\"));
 284 
				System::String ^sFile = _US(str->str.findreplace("/", "\\").ToString());
285 
				if ( this->IsOpen(sFile) )
 285 
				if ( this->IsOpen(sFile) )
286 
					continue;
 286 
					continue;
287 
				if ( this->IsOpen(SystemStringFromCyString(str->str.findreplace("\\", "/"))) )
 287 
				if ( this->IsOpen(_US(str->str.findreplace("\\", "/").ToString())) )
288 
					continue;
 288 
					continue;
289 
 
 289 
 
290 
				// otherwise add it to the list
 290 
				// otherwise add it to the list
291 
				System::Windows::Forms::ToolStripMenuItem ^newItem = gcnew System::Windows::Forms::ToolStripMenuItem;
 291 
				System::Windows::Forms::ToolStripMenuItem ^newItem = gcnew System::Windows::Forms::ToolStripMenuItem;
292 
				newItem->Text = sFile;
 292 
				newItem->Text = sFile;
Line 670... Line 670...
670 
			}
670 
			}
671 
			else
 671 
			else
672 
			{
 672 
			{
673 
				if ( display )
 673 
				if ( display )
674 
				{
 674 
				{
675 
					System::String ^sError = "Unknown Error (" + SystemStringFromCyString(CyString::Number(error)) + ")";
 675 
					System::String ^sError = "Unknown Error (" + _US(Utils::WString::Number(error)) + ")";
676 
					switch ( error )
 676 
					switch ( error )
677 
					{
 677 
					{
678 
						case INSTALLERR_OLD:
 678 
						case INSTALLERR_OLD:
679 
							sError = "Old unsupported package file";
 679 
							sError = "Old unsupported package file";
680 
							break;
 680 
							break;
Line 754... Line 754...
754 
							CyString first = l.GetToken(":", 1, 1);
 754 
							CyString first = l.GetToken(":", 1, 1);
755 
							CyString rest = l.GetToken(":", 2);
 755 
							CyString rest = l.GetToken(":", 2);
756 
							rest.RemoveFirstSpace();
 756 
							rest.RemoveFirstSpace();
757 
 
 757 
 
758 
							if ( first.Compare("File") )
 758 
							if ( first.Compare("File") )
759 
								list->Add(SystemStringFromCyString(rest));
 759 
								list->Add(_US(rest.ToString()));
760 
						}
 760 
						}
761 
 
 761 
 
762 
						this->OpenFiles(list, true, true);
 762 
						this->OpenFiles(list, true, true);
763 
 
 763 
 
764 
						CLEANSPLIT(aLines, num);
 764 
						CLEANSPLIT(aLines, num);
Line 808... Line 808...
808 
			System::String ^filter;
 808 
			System::String ^filter;
809 
			for ( int i = 0; i < FILETYPE_MAX; i++ )
 809 
			for ( int i = 0; i < FILETYPE_MAX; i++ )
810 
			{
 810 
			{
811 
				if ( filter )
 811 
				if ( filter )
812 
					filter += "|";
 812 
					filter += "|";
813 
				filter += SystemStringFromCyString(GetFileTypeString(i));
 813 
				filter += _US(GetFileTypeString(i));
814 
				filter += "|";
 814 
				filter += "|";
815 
				// add extensions
 815 
				// add extensions
816 
				switch ( i )
 816 
				switch ( i )
817 
				{
 817 
				{
818 
					case FILETYPE_SCRIPT:
 818 
					case FILETYPE_SCRIPT: