Changeset 462

Show
Ignore:
Timestamp:
11/28/08 16:04:11 (1 year ago)
Author:
jdecq
Message:

b2 #8574, remember the last selected choice for private photo, w.r.t friends and family... sticky per session for now, not per photo.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/uploadr/MacUploadr.app/Contents/Resources

    • Property svn:ignore changed from
      extensions
      gecko-sdk.win
      updates
      xulrunner
      Flickr Uploadr.exe
      xulrunner-sdk
      xulrunner-from_Install
      gecko-sdk.win-1.8
      Venkman
      xulrunner-1.9.0.1
      to
      extensions
      gecko-sdk.win
      updates
      xulrunner
      Flickr Uploadr.exe
      xulrunner-sdk
      xulrunner-from_Install
      gecko-sdk.win-1.8
      Venkman
      xulrunner-1.9.0.1
      xulrunner-nightly
  • trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/meta.js

    r451 r462  
    2020        // Auto-select, which is cancellable by a click during thumbing 
    2121        auto_select: conf.auto_select, 
     22 
     23    // Last private setting: 0=private, 1=family, 2=friends, 3=f&f 
     24    last_private_settings: 0, 
    2225 
    2326        // Load a photo's metadata from JS into the DOM 
     
    345348 
    346349                if (1 == parseInt(value)) { 
     350                        meta.last_private_settings = document.getElementById(prefix + '_is_friend').checked | (document.getElementById(prefix + '_is_family').checked << 1); 
    347351                        document.getElementById(prefix + '_is_friend').checked = false; 
    348352                        document.getElementById(prefix + '_is_family').checked = false; 
     
    350354                        document.getElementById(prefix + '_is_family').disabled = true; 
    351355                } else { 
    352                         document.getElementById(prefix + '_is_friend').disabled = false; 
    353                         document.getElementById(prefix + '_is_family').disabled = false; 
     356                    if (document.getElementById(prefix + '_is_friend').disabled === true) { 
     357                            document.getElementById(prefix + '_is_friend').disabled = false; 
     358                            document.getElementById(prefix + '_is_friend').checked = meta.last_private_settings & 1; 
     359                    } 
     360                    if (document.getElementById(prefix + '_is_family').disabled === true) { 
     361                            document.getElementById(prefix + '_is_family').disabled = false; 
     362                            document.getElementById(prefix + '_is_family').checked = meta.last_private_settings & 2; 
     363                    } 
    354364                } 
    355365        }, 
  • trunk/uploadr/README.windows

    r433 r462  
    344344of your app, UPLOADR/MacUploadr.app/Contents/Resources/, rename it to 
    345345"Flickr Uploadr.exe" and double-click it to run Uploadr. 
     346you also need to change the resource of this file to use the flickr uploadr icon. 
     347You can use XN Resource editor from http://www.wilsonc.demon.co.uk/d10resourceeditor.htm 
    346348 
    347349You can hack the icons.ico file into the executable using Resource