Subversion Repositories spk

Rev

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

Rev 49 Rev 50
Line 216... Line 216...
216
 
216
 
217
		for ( CBaseFile *p = m_pPackages->FirstPackage(); p; p = m_pPackages->NextPackage() )
217
		for ( CBaseFile *p = m_pPackages->FirstPackage(); p; p = m_pPackages->NextPackage() )
218
		{
218
		{
219
			if ( p->IsMod() )
219
			if ( p->IsMod() )
220
				continue;
220
				continue;
221
			if ( p->GetAuthor().Compare("PluginManager") )
221
			if ( p->author().Compare("PluginManager") )
222
				continue;
222
				continue;
223
			// if thier parent is a library dont add unless top level
223
			// if thier parent is a library dont add unless top level
224
			if ( currentParent && p->GetParent() && p->GetParent()->GetType() == TYPE_SPK && ((CSpkFile *)p->GetParent())->IsLibrary() )
224
			if ( currentParent && p->GetParent() && p->GetParent()->GetType() == TYPE_SPK && ((CSpkFile *)p->GetParent())->IsLibrary() )
225
				continue;
225
				continue;
226
			else if ( p->GetParent() == currentParent )
226
			else if ( p->GetParent() == currentParent )
Line 239... Line 239...
239
		int i = 0;
239
		int i = 0;
240
		for ( CBaseFile *p = packageList.First(); p; p = packageList.Next(), i++ )
240
		for ( CBaseFile *p = packageList.First(); p; p = packageList.Next(), i++ )
241
		{
241
		{
242
			aPackages[i] = gcnew SortPackage(p);
242
			aPackages[i] = gcnew SortPackage(p);
243
			if ( m_iSortingColumn == SORT_AUTHOR ) // sort by author
243
			if ( m_iSortingColumn == SORT_AUTHOR ) // sort by author
244
				aNames[i] = SystemStringFromCyString(p->GetAuthor())->ToLower();
244
				aNames[i] = _US(p->author())->ToLower();
245
			else if ( m_iSortingColumn == SORT_VERSION ) // sort by author
245
			else if ( m_iSortingColumn == SORT_VERSION ) // sort by author
246
				aNames[i] = SystemStringFromCyString(p->GetVersion())->ToLower();
246
				aNames[i] = _US(p->version())->ToLower();
247
			else if ( m_iSortingColumn == SORT_CREATED ) // sort by author
247
			else if ( m_iSortingColumn == SORT_CREATED ) // sort by author
248
			{
-
 
249
				CyString date = p->GetCreationDate().GetToken("/", 3, 3) + p->GetCreationDate().GetToken("/", 2, 2) + p->GetCreationDate().GetToken("/", 1, 1);
248
				aNames[i] = _US(p->creationDate().token("/", 3) + p->creationDate().token("/", 2) + p->creationDate().token("/", 1));
250
				aNames[i] = SystemStringFromCyString(date);
-
 
251
			}
-
 
252
			else if ( m_iSortingColumn == SORT_ENABLE ) // sort by author
249
			else if ( m_iSortingColumn == SORT_ENABLE ) // sort by author
253
			{
250
			{
254
				if ( p->IsEnabled() )
251
				if ( p->IsEnabled() )
255
					aNames[i] = SystemStringFromCyString(CyString::Number(1));
252
					aNames[i] = SystemStringFromCyString(CyString::Number(1));
256
				else
253
				else
Line 284... Line 281...
284
		for ( i = 0; i < aPackages->Length; i++ )
281
		for ( i = 0; i < aPackages->Length; i++ )
285
		{
282
		{
286
			CBaseFile *p = (m_bSortingAsc) ? aPackages[i]->Package : aPackages[(aPackages->Length - 1 - i)]->Package;
283
			CBaseFile *p = (m_bSortingAsc) ? aPackages[i]->Package : aPackages[(aPackages->Length - 1 - i)]->Package;
287
			CyString name;
284
			CyString name;
288
			if ( p->GetType() == TYPE_ARCHIVE )
285
			if ( p->GetType() == TYPE_ARCHIVE )
289
				name = CFileIO(p->GetFilename()).GetFilename();
286
				name = CFileIO(p->filename()).GetFilename();
290
			else
287
			else
291
				name = p->GetLanguageName(m_pPackages->GetLanguage());
288
				name = p->GetLanguageName(m_pPackages->GetLanguage());
292
 
289
 
293
			int indent = 0;
290
			int indent = 0;
294
			CBaseFile *parent = p;
291
			CBaseFile *parent = p;
Line 307... Line 304...
307
					--indent;
304
					--indent;
308
			}
305
			}
309
 
306
 
310
			ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(name));
307
			ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(name));
311
			item->IndentCount = (indent * 2);
308
			item->IndentCount = (indent * 2);
312
			item->SubItems->Add(SystemStringFromCyString(p->GetAuthor()));
309
			item->SubItems->Add(_US(p->author()));
313
			item->SubItems->Add(SystemStringFromCyString(p->GetVersion()));
310
			item->SubItems->Add(_US(p->version()));
314
			item->SubItems->Add(SystemStringFromCyString(p->GetCreationDate()));
311
			item->SubItems->Add(_US(p->creationDate()));
315
			if ( p->GetType() == TYPE_XSP )
312
			if ( p->GetType() == TYPE_XSP )
316
				item->SubItems->Add("Ship");
313
				item->SubItems->Add("Ship");
317
			else if ( p->GetType() == TYPE_ARCHIVE )
314
			else if ( p->GetType() == TYPE_ARCHIVE )
318
				item->SubItems->Add("- Archive -");
315
				item->SubItems->Add("- Archive -");
319
			else if ( p->GetType() == TYPE_SPK )
316
			else if ( p->GetType() == TYPE_SPK )
Line 644... Line 641...
644
			CyString sDisplay;
641
			CyString sDisplay;
645
			CyString sAfterText;
642
			CyString sAfterText;
646
			for ( CBaseFile *p = packageList.First(); p; p = packageList.Next() )
643
			for ( CBaseFile *p = packageList.First(); p; p = packageList.Next() )
647
			{
644
			{
648
				sAfterText = m_pPackages->GetUninstallAfterText(p);
645
				sAfterText = m_pPackages->GetUninstallAfterText(p);
649
				m_pPi->AddPackageWithGroup(SystemStringFromCyString(p->GetLanguageName(m_pPackages->GetLanguage())), SystemStringFromCyString(p->GetAuthor()), SystemStringFromCyString(p->GetVersion()), (sAfterText.Empty() ? "Uninstalled" : SystemStringFromCyString(sAfterText)), "Uninstalled");
646
				m_pPi->AddPackageWithGroup(SystemStringFromCyString(p->GetLanguageName(m_pPackages->GetLanguage())), _US(p->author()), _US(p->version()), (sAfterText.Empty() ? "Uninstalled" : SystemStringFromCyString(sAfterText)), "Uninstalled");
650
				sDisplay = p->GetFullPackageName(m_pPackages->GetLanguage());
647
				sDisplay = p->GetFullPackageName(m_pPackages->GetLanguage());
651
				delete p;
648
				delete p;
652
			}
649
			}
653
			for ( CBaseFile *p = disableList.First(); p; p = disableList.Next() )
650
			for ( CBaseFile *p = disableList.First(); p; p = disableList.Next() )
654
				m_pPi->AddPackageWithGroup(SystemStringFromCyString(p->GetLanguageName(m_pPackages->GetLanguage())), SystemStringFromCyString(p->GetAuthor()), SystemStringFromCyString(p->GetVersion()), "Disabled", "Dependants Disabled");
651
				m_pPi->AddPackageWithGroup(SystemStringFromCyString(p->GetLanguageName(m_pPackages->GetLanguage())), _US(p->author()), _US(p->version()), "Disabled", "Dependants Disabled");
655
			packageList.clear();			
652
			packageList.clear();			
656
 
653
 
657
			if ( m_pPi->PackageCount() == 1 )
654
			if ( m_pPi->PackageCount() == 1 )
658
			{
655
			{
659
				if ( sAfterText.Empty() )
656
				if ( sAfterText.Empty() )
Line 679... Line 676...
679
		{
676
		{
680
			if ( m_pPackages->DisablePreparedPackages(0, 0, &packageList) )
677
			if ( m_pPackages->DisablePreparedPackages(0, 0, &packageList) )
681
			{
678
			{
682
				for ( CBaseFile *p = packageList.First(); p; p = packageList.Next() )
679
				for ( CBaseFile *p = packageList.First(); p; p = packageList.Next() )
683
				{
680
				{
684
					m_pPi->AddPackageWithGroup(SystemStringFromCyString(p->GetLanguageName(m_pPackages->GetLanguage())), SystemStringFromCyString(p->GetAuthor()), SystemStringFromCyString(p->GetVersion()), "Disabled", "Disabled Packages");
681
					m_pPi->AddPackageWithGroup(SystemStringFromCyString(p->GetLanguageName(m_pPackages->GetLanguage())), _US(p->author()), _US(p->version()), "Disabled", "Disabled Packages");
685
					display = "Package Disabled\n\n" + SystemStringFromCyString(p->GetFullPackageName(m_pPackages->GetLanguage()));
682
					display = "Package Disabled\n\n" + SystemStringFromCyString(p->GetFullPackageName(m_pPackages->GetLanguage()));
686
				}
683
				}
687
			}
684
			}
688
			else
685
			else
689
				this->DisplayMessageBox(true, "Disable Error", "Error Disabling packages", MessageBoxButtons::OK, MessageBoxIcon::Stop);
686
				this->DisplayMessageBox(true, "Disable Error", "Error Disabling packages", MessageBoxButtons::OK, MessageBoxIcon::Stop);
Line 694... Line 691...
694
		{
691
		{
695
			if ( m_pPackages->EnablePreparedPackages(0, 0, &packageList) )
692
			if ( m_pPackages->EnablePreparedPackages(0, 0, &packageList) )
696
			{
693
			{
697
				for ( CBaseFile *p = packageList.First(); p; p = packageList.Next() )
694
				for ( CBaseFile *p = packageList.First(); p; p = packageList.Next() )
698
				{
695
				{
699
					m_pPi->AddPackageWithGroup(SystemStringFromCyString(p->GetLanguageName(m_pPackages->GetLanguage())), SystemStringFromCyString(p->GetAuthor()), SystemStringFromCyString(p->GetVersion()), "Enabled", "Enable Packages");
696
					m_pPi->AddPackageWithGroup(SystemStringFromCyString(p->GetLanguageName(m_pPackages->GetLanguage())), _US(p->author()), _US(p->version()), "Enabled", "Enable Packages");
700
					display = "Package Enabled\n\n" + SystemStringFromCyString(p->GetFullPackageName(m_pPackages->GetLanguage()));
697
					display = "Package Enabled\n\n" + SystemStringFromCyString(p->GetFullPackageName(m_pPackages->GetLanguage()));
701
				}
698
				}
702
			}
699
			}
703
			else
700
			else
704
				this->DisplayMessageBox(true, "Enable Error", "Error Enabling packages", MessageBoxButtons::OK, MessageBoxIcon::Stop);
701
				this->DisplayMessageBox(true, "Enable Error", "Error Enabling packages", MessageBoxButtons::OK, MessageBoxIcon::Stop);
Line 744... Line 741...
744
						CyString packageName = p->GetFullPackageName(m_pPackages->GetLanguage());
741
						CyString packageName = p->GetFullPackageName(m_pPackages->GetLanguage());
745
						CyString afterText = m_pPackages->GetInstallAfterText(p);
742
						CyString afterText = m_pPackages->GetInstallAfterText(p);
746
 
743
 
747
						if ( afterText.Empty() )
744
						if ( afterText.Empty() )
748
							afterText = "Installed";
745
							afterText = "Installed";
749
						m_pPi->AddPackage(SystemStringFromCyString(packageName), SystemStringFromCyString(p->GetAuthor()), SystemStringFromCyString(p->GetVersion()), SystemStringFromCyString(afterText));
746
						m_pPi->AddPackage(SystemStringFromCyString(packageName), _US(p->author()), _US(p->version()), SystemStringFromCyString(afterText));
750
					}
747
					}
751
					for ( CListNode<CBaseFile> *node = erroredPackages.Front(); node; node = node->next() )
748
					for ( CListNode<CBaseFile> *node = erroredPackages.Front(); node; node = node->next() )
752
					{
749
					{
753
						CBaseFile *p = node->Data();
750
						CBaseFile *p = node->Data();
754
						CyString packageName = p->GetFullPackageName(m_pPackages->GetLanguage());
751
						CyString packageName = p->GetFullPackageName(m_pPackages->GetLanguage());
755
						m_pPi->AddPackage(SystemStringFromCyString(packageName), SystemStringFromCyString(p->GetAuthor()), SystemStringFromCyString(p->GetVersion()), SystemStringFromCyString("Failed to Install"));
752
						m_pPi->AddPackage(SystemStringFromCyString(packageName), _US(p->author()), _US(p->version()), SystemStringFromCyString("Failed to Install"));
756
					}
753
					}
757
 
754
 
758
					m_bDisplayDialog = true;
755
					m_bDisplayDialog = true;
759
				}
756
				}
760
			}
757
			}
Line 777... Line 774...
777
					CyStringList packages;
774
					CyStringList packages;
778
					for ( CListNode<CBaseFile> *node = erroredPackages.Front(); node; node = node->next() )
775
					for ( CListNode<CBaseFile> *node = erroredPackages.Front(); node; node = node->next() )
779
					{
776
					{
780
						CBaseFile *p = node->Data();
777
						CBaseFile *p = node->Data();
781
						CyString packageName = p->GetFullPackageName(m_pPackages->GetLanguage());
778
						CyString packageName = p->GetFullPackageName(m_pPackages->GetLanguage());
782
						m_pPi->AddPackage(SystemStringFromCyString(packageName), SystemStringFromCyString(p->GetAuthor()), SystemStringFromCyString(p->GetVersion()), "Failed: " + SystemStringFromCyString(CBaseFile::ErrorString(p->GetLastError(), p->GetLastErrorString())));
779
						m_pPi->AddPackage(SystemStringFromCyString(packageName), _US(p->author()), _US(p->version()), "Failed: " + SystemStringFromCyString(CBaseFile::ErrorString(p->GetLastError(), p->GetLastErrorString())));
783
					}
780
					}
784
 
781
 
785
					m_bDisplayDialog = true;
782
					m_bDisplayDialog = true;
786
				}
783
				}
787
			}
784
			}
Line 1268... Line 1265...
1268
		CBaseFile *p = mod->SelectedMod();
1265
		CBaseFile *p = mod->SelectedMod();
1269
		if ( result == System::Windows::Forms::DialogResult::OK )
1266
		if ( result == System::Windows::Forms::DialogResult::OK )
1270
		{
1267
		{
1271
			if ( p )
1268
			if ( p )
1272
			{
1269
			{
1273
				if ( this->InstallPackage(SystemStringFromCyString(p->GetFilename()), true, false, true) )
1270
				if ( this->InstallPackage(_US(p->filename()), true, false, true) )
1274
					doenable = false;
1271
					doenable = false;
1275
			}
1272
			}
1276
		}
1273
		}
1277
		else if ( result == System::Windows::Forms::DialogResult::Yes )
1274
		else if ( result == System::Windows::Forms::DialogResult::Yes )
1278
			this->StartInstalling(false, true);
1275
			this->StartInstalling(false, true);
Line 1334... Line 1331...
1334
				// from file
1331
				// from file
1335
				if ( p->GetNum() < 0 )
1332
				if ( p->GetNum() < 0 )
1336
				{
1333
				{
1337
					if ( m_pPackages->GetEnabledMod() )
1334
					if ( m_pPackages->GetEnabledMod() )
1338
						m_pPackages->DisablePackage(m_pPackages->GetEnabledMod(), 0, 0);
1335
						m_pPackages->DisablePackage(m_pPackages->GetEnabledMod(), 0, 0);
1339
					if ( this->InstallPackage(SystemStringFromCyString(p->GetFilename()), true, false, true) )
1336
					if ( this->InstallPackage(_US(p->filename()), true, false, true) )
1340
						reEnable = false;
1337
						reEnable = false;
1341
				}
1338
				}
1342
				// otherwise just enable it
1339
				// otherwise just enable it
1343
				else
1340
				else
1344
				{
1341
				{
Line 1724... Line 1721...
1724
 
1721
 
1725
				if ( !p->CheckGameCompatability(m_pPackages->GetGame()) )
1722
				if ( !p->CheckGameCompatability(m_pPackages->GetGame()) )
1726
					continue;
1723
					continue;
1727
 
1724
 
1728
				// if its installed, check if we have a newer version
1725
				// if its installed, check if we have a newer version
1729
				CBaseFile *check = m_pPackages->FindSpkPackage(p->GetName(), p->GetAuthor());
1726
				CBaseFile *check = m_pPackages->FindSpkPackage(p->name(), p->author());
1730
				if ( check )
1727
				if ( check )
1731
				{
1728
				{
1732
					if ( check->GetVersion().CompareVersion(p->GetVersion()) != COMPARE_OLDER )
1729
					if ( check->version().compareVersion(p->version()) != COMPARE_OLDER )
1733
					{
1730
					{
1734
						this->InstallPackage(Files[i], false, true, true);
1731
						this->InstallPackage(Files[i], false, true, true);
1735
						installing = true;
1732
						installing = true;
1736
					}
1733
					}
1737
				}
1734
				}
Line 2251... Line 2248...
2251
					showSep2 = true;
2248
					showSep2 = true;
2252
				}
2249
				}
2253
				if ( !p->email().empty() )
2250
				if ( !p->email().empty() )
2254
				{
2251
				{
2255
					this->emailAuthorToolStripMenuItem->Visible = true;
2252
					this->emailAuthorToolStripMenuItem->Visible = true;
2256
					this->emailAuthorToolStripMenuItem->Tag = "mailto://" + _US(p->email()) + "?subject=Re: " + SystemStringFromCyString(p->GetName().FindReplace(" ", "%20"));
2253
					this->emailAuthorToolStripMenuItem->Tag = "mailto://" + _US(p->email()) + "?subject=Re: " + _US(p->name().findReplace(" ", "%20"));
2257
					showSep2 = true;
2254
					showSep2 = true;
2258
				}
2255
				}
2259
				if ( !p->webSite().empty() ) {
2256
				if ( !p->webSite().empty() ) {
2260
					this->visitWebSiteToolStripMenuItem->Visible = true;
2257
					this->visitWebSiteToolStripMenuItem->Visible = true;
2261
					if ( !p->webSite().isin("http://") ) 
2258
					if ( !p->webSite().isin("http://") ) 
Line 2667... Line 2664...
2667
			try 
2664
			try 
2668
			{
2665
			{
2669
				for ( CBaseFile *package = m_pPackages->FirstPackage(); package; package = m_pPackages->NextPackage() )
2666
				for ( CBaseFile *package = m_pPackages->FirstPackage(); package; package = m_pPackages->NextPackage() )
2670
				{
2667
				{
2671
					if ( enabled && !package->IsEnabled() ) continue;
2668
					if ( enabled && !package->IsEnabled() ) continue;
2672
					CyString line = package->GetName() + " :: " + package->GetAuthor() + " :: " + package->GetVersion() + " :: " + package->GetCreationDate() + " :: ";
2669
					Utils::String line = package->name() + " :: " + package->author() + " :: " + package->version() + " :: " + package->creationDate() + " :: ";
2673
						
2670
						
2674
					if ( package->GetType() == TYPE_XSP )
2671
					if ( package->GetType() == TYPE_XSP )
2675
						line += "Ship :: ";
2672
						line += "Ship :: ";
2676
					else if ( package->GetType() == TYPE_ARCHIVE )
2673
					else if ( package->GetType() == TYPE_ARCHIVE )
2677
						line += "- Archive - :: ";
2674
						line += "- Archive - :: ";
2678
					else if ( package->GetType() == TYPE_SPK )
2675
					else if ( package->GetType() == TYPE_SPK ) {
2679
					{
-
 
2680
						CyString type = ((CSpkFile *)package)->GetScriptTypeString(m_pPackages->GetLanguage());
2676
						Utils::String type = ((CSpkFile *)package)->GetScriptTypeString(m_pPackages->GetLanguage());
2681
						if ( !type.Empty() )
-
 
2682
							line += type + " :: ";
2677
						if ( !type.empty() ) line += type + " :: ";
2683
					}
2678
					}
2684
 
2679
 
2685
					line += ((package->IsEnabled()) ? CyString("Yes") : CyString("No")) + " :: " + ((package->IsSigned()) ? "Yes" : "No");
2680
					line = line + ((package->IsEnabled()) ? "Yes" : "No") + " :: " + ((package->IsSigned()) ? "Yes" : "No");
2686
					sw->WriteLine(SystemStringFromCyString(line));
2681
					sw->WriteLine(_US(line));
2687
				}
2682
				}
2688
			}
2683
			}
2689
			finally
2684
			finally
2690
			{
2685
			{
2691
				if ( sw )
2686
				if ( sw )