Ticket #5705: upload_no_ask.patch

src/interface/settings/optionspage_edit.cpp

@@ -36 +36 @@
         SetRCheck(XRCID("ID_USEASSOCIATIONS"), true, failure);
 
     SetCheckFromOption(XRCID("ID_EDIT_TRACK_LOCAL"), OPTION_EDIT_TRACK_LOCAL, failure);
+    SetCheckFromOption(XRCID("ID_EDIT_NO_ASK"), OPTION_EDIT_NO_ASK, failure);
 
     if (!failure)
         SetCtrlState();
@@ -58 +59 @@
         pOptions->SetOption(OPTION_EDIT_ALWAYSDEFAULT, 0);
 
     SetOptionFromCheck(XRCID("ID_EDIT_TRACK_LOCAL"), OPTION_EDIT_TRACK_LOCAL);
+    SetOptionFromCheck(XRCID("ID_EDIT_NO_ASK"), OPTION_EDIT_NO_ASK);
         
     return true;
 }

src/interface/Options.h

@@ -72 +72 @@
     OPTION_COMPARE_HIDEIDENTICAL,
     OPTION_SEARCH_SORTORDER,
     OPTION_EDIT_TRACK_LOCAL,
+    OPTION_EDIT_NO_ASK,
     OPTION_PREVENT_IDLESLEEP,
     OPTION_FILTEREDIT_SIZE,
     OPTION_INVALID_CHAR_REPLACE_ENABLE,

src/interface/resources/settings.xrc

@@ -1889 +1889 @@
               <label>&amp;Watch locally edited files and prompt to upload modifications</label>
             </object>
           </object>
+           <object class="sizeritem">
+            <object class="wxCheckBox" name="ID_EDIT_NO_ASK">
+              <label>&amp;Do not ask before uploading files</label>
+            </object>
+          </object>
           <cols>1</cols>
           <vgap>5</vgap>
           <growablecols>0</growablecols>

src/interface/edithandler.cpp

@@ -657 +657 @@
                 continue;
 
             // File has changed, ask user what to do
+            int res = wxID_YES;
+            bool remove;
 
-            m_busyTimer.Stop();
-            wxMouseState mouseState = wxGetMouseState();
-            if (mouseState.LeftDown() || mouseState.MiddleDown() || mouseState.RightDown())
-            {
-                m_busyTimer.Start(1000, true);
-                insideCheckForModifications = false;
-                return;
-            }
+            if (!COptions::Get()->GetOptionVal(OPTION_EDIT_NO_ASK)) {
+                // File has changed and the no ask option is set
 
-            wxTopLevelWindow* pTopWindow = (wxTopLevelWindow*)wxTheApp->GetTopWindow();
-            if (pTopWindow && pTopWindow->IsIconized())
-            {
-                pTopWindow->RequestUserAttention(wxUSER_ATTENTION_INFO);
-                insideCheckForModifications = false;
-                return;
+                m_busyTimer.Stop();
+                wxMouseState mouseState = wxGetMouseState();
+                if (mouseState.LeftDown() || mouseState.MiddleDown() || mouseState.RightDown())
+                {
+                    m_busyTimer.Start(1000, true);
+                    insideCheckForModifications = false;
+                    return;
+                }
+
+                wxTopLevelWindow* pTopWindow = (wxTopLevelWindow*)wxTheApp->GetTopWindow();
+                if (pTopWindow && pTopWindow->IsIconized())
+                {
+                    pTopWindow->RequestUserAttention(wxUSER_ATTENTION_INFO);
+                    insideCheckForModifications = false;
+                    return;
+                }
+
+                res = DisplayChangeNotification(CEditHandler::fileType(i), iter, remove);
+                if (res == -1)
+                    continue;
             }
 
-            bool remove;
-            int res = DisplayChangeNotification(CEditHandler::fileType(i), iter, remove);
-            if (res == -1)
-                continue;
-
             if (res == wxID_YES)
             {
                 UploadFile(CEditHandler::fileType(i), iter, remove);