From ec340806e607943e9675c2236ed8e699bf8a1168 Mon Sep 17 00:00:00 2001 From: ImgBotApp Date: Sat, 23 Jan 2021 00:57:33 +0000 Subject: [PATCH] [ImgBot] Optimize images /doc/unified_diff_svn.svg -- 92.33kb -> 48.49kb (47.47%) Signed-off-by: ImgBotApp --- doc/unified_diff_svn.svg | 1462 +------------------------------------- 1 file changed, 1 insertion(+), 1461 deletions(-) diff --git a/doc/unified_diff_svn.svg b/doc/unified_diff_svn.svg index e9e794b..49db40a 100644 --- a/doc/unified_diff_svn.svg +++ b/doc/unified_diff_svn.svg @@ -1,1461 +1 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - Unified Diff/Patch Format (Subversion) - - - comments are ignored - - - - the first file thatexists is used - - - - may contain severalhunks for each file - - - - -line_from,total_before+line_after,total_after - - - - --- filename \t comment - - - - line ends may differ - - - - for the format like-line_from +line_aftertotal_xxx = 1 - - - - - "\ No newline at end of file" marker is used iffile ends without newline - - - http://en.wikipedia.org/wiki/Diff#Unified_format - http://techtonik.rainforce.org - Index: src/plugins/contrib/devpak_plugin/updatedlg.cpp===================================================================--- src/plugins/contrib/devpak_plugin/updatedlg.cpp (revision 5106)+++ src/plugins/contrib/devpak_plugin/updatedlg.cpp (working copy)@@ -94,11 +94,13 @@ lst->InsertColumn(1, _("Version")); lst->InsertColumn(2, _("Installed")); lst->InsertColumn(3, _("Size"), wxLIST_FORMAT_RIGHT);+ lst->InsertColumn(4, _("Rev")); - lst->SetColumnWidth(0, lst->GetSize().x - (64 * 3) - 2); // 1st column takes all remaining space+ lst->SetColumnWidth(0, lst->GetSize().x - (64 * 3 + 40) - 6 ); // 1st column takes all remaining space lst->SetColumnWidth(1, 64); lst->SetColumnWidth(2, 64); lst->SetColumnWidth(3, 64);+ lst->SetColumnWidth(4, 40); } void UpdateDlg::AddRecordToList(UpdateRec* rec)@@ -111,8 +113,20 @@ lst->SetItem(idx, 1, rec->version); lst->SetItem(idx, 2, rec->installed_version); lst->SetItem(idx, 3, rec->size);+ lst->SetItem(idx, 4, rec->revision); } +wxString UpdateDlg::GetListColumnText(int idx, int col) {+ wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl);+ int index = idx == -1 ? lst->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) : idx;+ wxListItem info;+ info.SetId(index);+ info.SetColumn(col);+ info.SetMask(wxLIST_MASK_TEXT);+ lst->GetItem(info);+ return info.GetText();+}+ void UpdateDlg::SetListColumnText(int idx, int col, const wxString& text) { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl);@@ -393,7 +407,9 @@ if (index == -1) return 0; wxString title = lst->GetItemText(index);- return FindRecByTitle(title, m_Recs, m_RecsCount);+ wxString version = GetListColumnText(index, 1);+ wxString revision = GetListColumnText(index, 4);+ return FindRec(title, version, revision, m_Recs, m_RecsCount); } void UpdateDlg::DownloadFile(bool dontInstall)Index: src/plugins/contrib/devpak_plugin/manifest.xml===================================================================--- src/plugins/contrib/devpak_plugin/manifest.xml (revision 5106)+++ src/plugins/contrib/devpak_plugin/manifest.xml (working copy)@@ -2,18 +2,19 @@ <CodeBlocks_plugin_manifest_file> <SdkVersion major="1" minor="10" release="0" /> <Plugin name="DevPakUpdater">- <Value title="Dev-C++ DevPak updater/installer" />- <Value version="0.1" />+ <Value title="DevPak updater/installer" />+ <Value version="0.2" /> <Value description="Installs selected DevPaks from the Internet" /> <Value author="Yiannis Mandravellos" /> <Value authorEmail="info@codeblocks.org" /> <Value authorWebsite="http://www.codeblocks.org/" /> <Value thanksTo="Dev-C++ community.- Julian R Seward for libbzip2.- libbzip2 copyright notice:- bzip2 and associated library libbzip2, are- copyright (C) 1996-2000 Julian R Seward.- All rights reserved." />+ Julian R Seward for libbzip2.++ libbzip2 copyright notice:+ bzip2 and associated library libbzip2, are+ copyright (C) 1996-2000 Julian R Seward.+ All rights reserved." /> <Value license="GPL" /> </Plugin>-</CodeBlocks_plugin_manifest_file>+</CodeBlocks_plugin_manifest_file>\ No newline at end of file - - - - - - - line numbers start from 1 - - - +Unified Diff/Patch Format (Subversion)comments are ignoredthe first file thatexists is usedmay contain severalhunks for each file-line_from,total_before+line_after,total_after--- filename \t commentline ends may differfor the format like-line_from +line_aftertotal_xxx = 1"\ No newline at end of file" marker is used iffile ends without newlinehttp://en.wikipedia.org/wiki/Diff#Unified_formathttp://techtonik.rainforce.orgIndex: src/plugins/contrib/devpak_plugin/updatedlg.cpp===================================================================--- src/plugins/contrib/devpak_plugin/updatedlg.cpp (revision 5106)+++ src/plugins/contrib/devpak_plugin/updatedlg.cpp (working copy)@@ -94,11 +94,13 @@ lst->InsertColumn(1, _("Version")); lst->InsertColumn(2, _("Installed")); lst->InsertColumn(3, _("Size"), wxLIST_FORMAT_RIGHT);+ lst->InsertColumn(4, _("Rev")); - lst->SetColumnWidth(0, lst->GetSize().x - (64 * 3) - 2); // 1st column takes all remaining space+ lst->SetColumnWidth(0, lst->GetSize().x - (64 * 3 + 40) - 6 ); // 1st column takes all remaining space lst->SetColumnWidth(1, 64); lst->SetColumnWidth(2, 64); lst->SetColumnWidth(3, 64);+ lst->SetColumnWidth(4, 40); } void UpdateDlg::AddRecordToList(UpdateRec* rec)@@ -111,8 +113,20 @@ lst->SetItem(idx, 1, rec->version); lst->SetItem(idx, 2, rec->installed_version); lst->SetItem(idx, 3, rec->size);+ lst->SetItem(idx, 4, rec->revision); } +wxString UpdateDlg::GetListColumnText(int idx, int col) {+ wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl);+ int index = idx == -1 ? lst->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) : idx;+ wxListItem info;+ info.SetId(index);+ info.SetColumn(col);+ info.SetMask(wxLIST_MASK_TEXT);+ lst->GetItem(info);+ return info.GetText();+}+ void UpdateDlg::SetListColumnText(int idx, int col, const wxString& text) { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl);@@ -393,7 +407,9 @@ if (index == -1) return 0; wxString title = lst->GetItemText(index);- return FindRecByTitle(title, m_Recs, m_RecsCount);+ wxString version = GetListColumnText(index, 1);+ wxString revision = GetListColumnText(index, 4);+ return FindRec(title, version, revision, m_Recs, m_RecsCount); } void UpdateDlg::DownloadFile(bool dontInstall)Index: src/plugins/contrib/devpak_plugin/manifest.xml===================================================================--- src/plugins/contrib/devpak_plugin/manifest.xml (revision 5106)+++ src/plugins/contrib/devpak_plugin/manifest.xml (working copy)@@ -2,18 +2,19 @@ <CodeBlocks_plugin_manifest_file> <SdkVersion major="1" minor="10" release="0" /> <Plugin name="DevPakUpdater">- <Value title="Dev-C++ DevPak updater/installer" />- <Value version="0.1" />+ <Value title="DevPak updater/installer" />+ <Value version="0.2" /> <Value description="Installs selected DevPaks from the Internet" /> <Value author="Yiannis Mandravellos" /> <Value authorEmail="info@codeblocks.org" /> <Value authorWebsite="http://www.codeblocks.org/" /> <Value thanksTo="Dev-C++ community.- Julian R Seward for libbzip2.- libbzip2 copyright notice:- bzip2 and associated library libbzip2, are- copyright (C) 1996-2000 Julian R Seward.- All rights reserved." />+ Julian R Seward for libbzip2.++ libbzip2 copyright notice:+ bzip2 and associated library libbzip2, are+ copyright (C) 1996-2000 Julian R Seward.+ All rights reserved." /> <Value license="GPL" /> </Plugin>-</CodeBlocks_plugin_manifest_file>+</CodeBlocks_plugin_manifest_file>\ No newline at end of fileline numbers start from 1 \ No newline at end of file