Fixed: SVN plugin - add confirm box on "close" svn repo (the first item)

fixes: eranif#1349 Updated folder and project SVGs
lssssj · Aug 1, 2016 · d778221 · d778221
1 parent 42bd8dc
commit d778221
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 59 deletions.
diff --git a/Runtime/codelite-bitmaps.zip b/Runtime/codelite-bitmaps.zip
diff --git a/Subversion2/subversion_view.cpp b/Subversion2/subversion_view.cpp
@@ -228,7 +228,7 @@ void SubversionView::CreatGUIControls()
 {
     MSWSetNativeTheme(m_treeCtrl);
     m_treeCtrl->SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-    
+
     // Assign the image list
     BitmapLoader* bmpLoader = m_plugin->GetManager()->GetStdIcons();
 
@@ -566,9 +566,6 @@ void SubversionView::CreateFileMenu(wxMenu* menu)
 
 void SubversionView::CreateRootMenu(wxMenu* menu)
 {
-    menu->Append(XRCID("svn_close_view"), wxT("Close"));
-    menu->AppendSeparator();
-
     menu->Append(XRCID("svn_update"), wxT("Update"));
     menu->Append(XRCID("svn_commit"), wxT("Commit"));
     menu->AppendSeparator();
@@ -592,6 +589,11 @@ void SubversionView::CreateRootMenu(wxMenu* menu)
 
     menu->AppendSeparator();
     menu->Append(XRCID("svn_properties"), _("Properties..."));
+
+    menu->AppendSeparator();
+    wxMenuItem* menuItem = new wxMenuItem(menu, XRCID("svn_close_view"), _("Close"));
+    menuItem->SetBitmap(m_plugin->GetManager()->GetStdIcons()->LoadBitmap("file_close"));
+    menu->Append(menuItem);
 }
 
 void SubversionView::DoGetPaths(const wxTreeItemId& parent, wxArrayString& paths)
@@ -1366,6 +1368,10 @@ void SubversionView::OnSciStcChange(wxStyledTextEvent& event)
 
 void SubversionView::OnCloseView(wxCommandEvent& event)
 {
+    if(::wxMessageBox(_("Close SVN view?"), _("Confirm"), wxICON_QUESTION | wxYES_NO | wxCANCEL | wxCANCEL_DEFAULT) !=
+        wxYES) {
+        return;
+    }
     DoChangeRootPathUI("");
 
     wxCommandEvent dummy;

diff --git a/bitmaps/16-folder-yellow-opened.png b/bitmaps/16-folder-yellow-opened.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/16-folder-yellow.png b/bitmaps/16-folder-yellow.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/16-project.png b/bitmaps/16-project.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-folder-yellow-opened.png b/bitmaps/24-folder-yellow-opened.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-folder-yellow.png b/bitmaps/24-folder-yellow.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-project.png b/bitmaps/24-project.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/svgs/folder-yellow-opened.svg b/svgs/folder-yellow-opened.svg
diff --git a/svgs/folder-yellow.svg b/svgs/folder-yellow.svg
diff --git a/svgs/project.svg b/svgs/project.svg