Subversion Repositories spk

Rev

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

Rev 197 Rev 203
Line 1179... Line 1179...
1179
 
1179
 
1180
		if ( m_pPackage->GetType() == TYPE_SPK )
1180
		if ( m_pPackage->GetType() == TYPE_SPK )
1181
		{
1181
		{
1182
			if ( ((CSpkFile *)m_pPackage)->IsPackageUpdate() )
1182
			if ( ((CSpkFile *)m_pPackage)->IsPackageUpdate() )
1183
			{
1183
			{
1184
				SNeededLibrary *n = m_pPackage->FindPackageNeeded("<package>", "<author>");
1184
				SNeededLibrary *n = m_pPackage->findPackageNeeded(L"<package>", L"<author>");
1185
				if ( !n )
1185
				if ( !n )
1186
					m_pPackage->AddNeededLibrary("<package>", "<author>", "1.00");
1186
					m_pPackage->addNeededLibrary(L"<package>", L"<author>", L"1.00");
1187
				n = m_pPackage->FindPackageNeeded("<package>", "<author>");
1187
				n = m_pPackage->findPackageNeeded(L"<package>", L"<author>");
1188
 
1188
 
1189
				if ( n )
1189
				if ( n )
1190
				{
1190
				{
1191
					if ( ((CSpkFile *)m_pPackage)->version().compareVersion(n->sMinVersion) != COMPARE_OLDER )
1191
					if ( ((CSpkFile *)m_pPackage)->version().compareVersion(n->sMinVersion) != COMPARE_OLDER )
1192
					{
1192
					{
Line 1258... Line 1258...
1258
		else
1258
		else
1259
			ofd->Filter = "Package Files (*.spk)|*.spk";
1259
			ofd->Filter = "Package Files (*.spk)|*.spk";
1260
		ofd->AddExtension = true;
1260
		ofd->AddExtension = true;
1261
		Utils::WString filename = m_pPackage->filename();
1261
		Utils::WString filename = m_pPackage->filename();
1262
		if (filename.empty())
1262
		if (filename.empty())
1263
			filename = m_pPackage->getAutosaveName().toWString();
1263
			filename = m_pPackage->getAutosaveName();
1264
		filename = filename.findReplace(L"/", L"\\");
1264
		filename = filename.findReplace(L"/", L"\\");
1265
		ofd->FileName = _US(filename);
1265
		ofd->FileName = _US(filename);
1266
		ofd->FilterIndex = 1;
1266
		ofd->FilterIndex = 1;
1267
		ofd->RestoreDirectory = true;
1267
		ofd->RestoreDirectory = true;
1268
		if ( ofd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
1268
		if ( ofd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
Line 1921... Line 1921...
1921
 
1921
 
1922
		 if ( depend->ShowDialog(this) == Windows::Forms::DialogResult::OK )
1922
		 if ( depend->ShowDialog(this) == Windows::Forms::DialogResult::OK )
1923
		 {
1923
		 {
1924
			 if ( builtin )
1924
			 if ( builtin )
1925
			 {
1925
			 {
1926
				 SNeededLibrary *ns = m_pPackage->FindPackageNeeded("<package>", "<author>");
1926
				 SNeededLibrary *ns = m_pPackage->findPackageNeeded(L"<package>", L"<author>");
1927
				 if ( ns )
1927
				 if ( ns )
1928
					 ns->sMinVersion = _S(depend->GetVersion());
1928
					 ns->sMinVersion = _S(depend->GetVersion());
1929
			 }
1929
			 }
1930
			 else
1930
			 else
1931
			 {
1931
			 {
1932
				 m_pPackage->RemovePackageNeeded(_S(m_pSelectedItem->Text), _S(m_pSelectedItem->SubItems[1]->Text));
1932
				 m_pPackage->removePackageNeeded(_WS(m_pSelectedItem->Text), _WS(m_pSelectedItem->SubItems[1]->Text));
1933
				 m_pPackage->AddNeededLibrary(_S(depend->GetName()), _S(depend->GetAuthor()), _S(depend->GetVersion()));
1933
				 m_pPackage->addNeededLibrary(_WS(depend->GetName()), _WS(depend->GetAuthor()), _S(depend->GetVersion()));
1934
			 }
1934
			 }
1935
			 this->UpdateDependacies();
1935
			 this->UpdateDependacies();
1936
			 this->UpdateChanged();
1936
			 this->UpdateChanged();
1937
		 }
1937
		 }
1938
	}
1938
	}