Subversion Repositories spk

Rev

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

Rev 184 Rev 191
Line 317... Line 317...
317
				if ( p->GetType() == TYPE_XSP )
317
				if ( p->GetType() == TYPE_XSP )
318
					aNames[i] = "Ship";
318
					aNames[i] = "Ship";
319
				else if ( p->GetType() == TYPE_ARCHIVE )
319
				else if ( p->GetType() == TYPE_ARCHIVE )
320
					aNames[i] = "- Archive -";
320
					aNames[i] = "- Archive -";
321
				else if ( p->GetType() == TYPE_SPK )
321
				else if ( p->GetType() == TYPE_SPK )
322
					aNames[i] = SystemStringFromCyString(((CSpkFile *)p)->GetScriptTypeString(m_pPackages->GetLanguage()));
322
					aNames[i] = _US(((CSpkFile *)p)->GetScriptTypeString(m_pPackages->GetLanguage()));
323
				else
323
				else
324
					aNames[i] = "";
324
					aNames[i] = "";
325
			}
325
			}
326
			else
326
			else
327
				aNames[i] = _US(p->name(m_pPackages->GetLanguage()))->ToLower();
327
				aNames[i] = _US(p->name(m_pPackages->GetLanguage()))->ToLower();
Line 354... Line 354...
354
 
354
 
355
				if ( p->GetParent() && p->GetParent() == m_pPackages->GetEnabledMod() )
355
				if ( p->GetParent() && p->GetParent() == m_pPackages->GetEnabledMod() )
356
					--indent;
356
					--indent;
357
			}
357
			}
358
 
358
 
359
			ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(name));
359
			ListViewItem ^item = gcnew ListViewItem(_US(name));
360
			item->UseItemStyleForSubItems = false;
360
			item->UseItemStyleForSubItems = false;
361
			item->IndentCount = (indent * 2);
361
			item->IndentCount = (indent * 2);
362
			item->SubItems->Add(_US(p->author()));
362
			item->SubItems->Add(_US(p->author()));
363
			item->SubItems->Add(_US(p->version()));
363
			item->SubItems->Add(_US(p->version()));
364
			item->SubItems->Add(_US(p->creationDate()));
364
			item->SubItems->Add(_US(p->creationDate()));
Line 367... Line 367...
367
			else if ( p->GetType() == TYPE_ARCHIVE )
367
			else if ( p->GetType() == TYPE_ARCHIVE )
368
				item->SubItems->Add("- Archive -");
368
				item->SubItems->Add("- Archive -");
369
			else if ( p->GetType() == TYPE_SPK )
369
			else if ( p->GetType() == TYPE_SPK )
370
			{
370
			{
371
				CSpkFile *spk = (CSpkFile *)p;
371
				CSpkFile *spk = (CSpkFile *)p;
372
				item->SubItems->Add(SystemStringFromCyString(spk->GetScriptTypeString(m_pPackages->GetLanguage())));
372
				item->SubItems->Add(_US(spk->GetScriptTypeString(m_pPackages->GetLanguage())));
373
			}
373
			}
374
			else
374
			else
375
				item->SubItems->Add("");
375
				item->SubItems->Add("");
376
 
376
 
377
			if ( p->IsEnabled() ) {
377
			if ( p->IsEnabled() ) {
Line 384... Line 384...
384
			}
384
			}
385
			if ( p->IsSigned() )
385
			if ( p->IsSigned() )
386
				item->SubItems->Add("Yes");
386
				item->SubItems->Add("Yes");
387
			else
387
			else
388
				item->SubItems->Add("No");
388
				item->SubItems->Add("No");
389
			item->Tag = SystemStringFromCyString(CyString::Number(p->GetNum()));
389
			item->Tag = _US(Utils::WString::Number(p->GetNum()));
390
 
390
 
391
			ListPackages->Items->Add(item);
391
			ListPackages->Items->Add(item);
392
 
392
 
393
			if ( useGroup )
393
			if ( useGroup )
394
				item->Group = useGroup;
394
				item->Group = useGroup;
Line 424... Line 424...
424
				if ( p->IsEnabled() )
424
				if ( p->IsEnabled() )
425
					groupName = groupName + " [1/1]";
425
					groupName = groupName + " [1/1]";
426
				else
426
				else
427
					groupName = groupName + " [0/1]";
427
					groupName = groupName + " [0/1]";
428
			}
428
			}
429
			item->Group->Header = SystemStringFromCyString(groupName);
429
			item->Group->Header = _US(groupName.ToString());
430
 
430
 
431
			// get the icon
431
			// get the icon
432
			item->ImageIndex = -1;
432
			item->ImageIndex = -1;
433
			if ( p->icon() )
433
			if ( p->icon() )
434
				PluginManager::DisplayListIcon(p, ListPackages, item);
434
				PluginManager::DisplayListIcon(p, ListPackages, item);
Line 741... Line 741...
741
			Utils::String sDisplay;
741
			Utils::String sDisplay;
742
			Utils::String sAfterText;
742
			Utils::String sAfterText;
743
			for ( CBaseFile *p = packageList.First(); p; p = packageList.Next() )
743
			for ( CBaseFile *p = packageList.First(); p; p = packageList.Next() )
744
			{
744
			{
745
				sAfterText = m_pPackages->getUninstallAfterText(p);
745
				sAfterText = m_pPackages->getUninstallAfterText(p);
746
				m_pPi->AddPackageWithGroup(_US(p->name(m_pPackages->GetLanguage())), _US(p->author()), _US(p->version()), (sAfterText.empty() ? "Uninstalled" : SystemStringFromCyString(sAfterText)), "Uninstalled");
746
				m_pPi->AddPackageWithGroup(_US(p->name(m_pPackages->GetLanguage())), _US(p->author()), _US(p->version()), (sAfterText.empty() ? "Uninstalled" : _US(sAfterText)), "Uninstalled");
747
				sDisplay = p->getFullPackageName(m_pPackages->GetLanguage());
747
				sDisplay = p->getFullPackageName(m_pPackages->GetLanguage());
748
				delete p;
748
				delete p;
749
			}
749
			}
750
			for ( CBaseFile *p = disableList.First(); p; p = disableList.Next() )
750
			for ( CBaseFile *p = disableList.First(); p; p = disableList.Next() )
751
				m_pPi->AddPackageWithGroup(_US(p->name(m_pPackages->GetLanguage())), _US(p->author()), _US(p->version()), "Disabled", "Dependants Disabled");
751
				m_pPi->AddPackageWithGroup(_US(p->name(m_pPackages->GetLanguage())), _US(p->author()), _US(p->version()), "Disabled", "Dependants Disabled");
Line 2045... Line 2045...
2045
 
2045
 
2046
			CLEANSPLIT(strs, max)
2046
			CLEANSPLIT(strs, max)
2047
 
2047
 
2048
			if ( !download.Empty() && !message.Empty() )
2048
			if ( !download.Empty() && !message.Empty() )
2049
			{
2049
			{
2050
				if ( this->DisplayMessageBox(false, "Updater", SystemStringFromCyString(message) + "Do You wish to download and install it?", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == System::Windows::Forms::DialogResult::Yes )
2050
				if ( this->DisplayMessageBox(false, "Updater", _US(message.ToString()) + "Do You wish to download and install it?", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == System::Windows::Forms::DialogResult::Yes )
2051
				{
2051
				{
2052
					// absolute address
2052
					// absolute address
2053
					CyString downloadFile;
2053
					CyString downloadFile;
2054
 
2054
 
2055
					int max;
2055
					int max;
Line 2072... Line 2072...
2072
 
2072
 
2073
					CLEANSPLIT(strs, max);
2073
					CLEANSPLIT(strs, max);
2074
 
2074
 
2075
					if ( !downloadFile.Empty() )
2075
					if ( !downloadFile.Empty() )
2076
					{
2076
					{
2077
						m_sDownload = SystemStringFromCyString(downloadFile);
2077
						m_sDownload = _US(downloadFile.ToString());
2078
						this->Close();
2078
						this->Close();
2079
						return;
2079
						return;
2080
					}
2080
					}
2081
				}
2081
				}
2082
			}
2082
			}
Line 2107... Line 2107...
2107
		{
2107
		{
2108
			System::String ^lines = System::IO::File::ReadAllText(mydoc + "\\Egosoft\\pluginmanager_load.dat");
2108
			System::String ^lines = System::IO::File::ReadAllText(mydoc + "\\Egosoft\\pluginmanager_load.dat");
2109
			System::IO::File::Delete(mydoc + "\\Egosoft\\pluginmanager_load.dat");
2109
			System::IO::File::Delete(mydoc + "\\Egosoft\\pluginmanager_load.dat");
2110
			if ( lines )
2110
			if ( lines )
2111
			{
2111
			{
2112
				CyString strLines = CyStringFromSystemString(lines);
2112
				Utils::WString strLines = _WS(lines);
2113
				int num;
2113
				int num;
2114
				CyString *aLines = strLines.SplitToken("\n", &num);
2114
				Utils::WString *aLines = strLines.tokenise(L"\n", &num);
2115
				if ( num && aLines )
2115
				if ( num && aLines )
2116
				{
2116
				{
2117
					for ( int i = 0; i < num; i++ )
2117
					for ( int i = 0; i < num; i++ )
2118
					{
2118
					{
2119
						CyString l = aLines[i];
2119
						Utils::WString l = aLines[i];
2120
						l = l.Remove(&quot;\r&quot;);
2120
						l = l.remove(&apos;\r&apos;);
2121
						CyString first = l.GetToken(":", 1, 1);
2121
						Utils::WString first = l.token(L":", 1);
2122
						CyString rest = l.GetToken(":", 2);
2122
						Utils::WString rest = l.tokens(L":", 2);
2123
						rest.RemoveFirstSpace();
2123
						rest.removeFirstSpace();
2124
 
2124
 
2125
						if ( first.Compare("File") )
2125
						if ( first.Compare("File") )
2126
						{
2126
						{
2127
							if ( m_bDirLocked ) {
2127
							if ( m_bDirLocked ) {
2128
								this->DisplayLocked(false);
2128
								this->DisplayLocked(false);
2129
								return;
2129
								return;
2130
							}
2130
							}
2131
							if ( this->InstallPackage(SystemStringFromCyString(rest), false, false, true) )
2131
							if ( this->InstallPackage(_US(rest), false, false, true) )
2132
								anytoinstall = true;
2132
								anytoinstall = true;
2133
						}
2133
						}
2134
					}
2134
					}
2135
 
2135
 
2136
					CLEANSPLIT(aLines, num);
2136
					CLEANSPLIT(aLines, num);