diff --git a/MainApp/FlickrSync.Designer.cs b/MainApp/FlickrSync.Designer.cs index e0b34c3..0788509 100644 --- a/MainApp/FlickrSync.Designer.cs +++ b/MainApp/FlickrSync.Designer.cs @@ -57,7 +57,6 @@ private void InitializeComponent() this.aboutToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.imageListLarge = new System.Windows.Forms.ImageList(this.components); this.labelCalc = new System.Windows.Forms.Label(); - this.webBrowser1 = new System.Windows.Forms.WebBrowser(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.labelStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.BottomToolStripPanel = new System.Windows.Forms.ToolStripPanel(); @@ -229,13 +228,6 @@ private void InitializeComponent() this.ViewLogMenuItem.Paint += new System.Windows.Forms.PaintEventHandler(this.ViewLogMenuItem_Paint); this.ViewLogMenuItem.Click += new System.EventHandler(this.ViewLogMenuItem_Click); // - // DonateMenuItem - // - this.DonateMenuItem.Name = "DonateMenuItem"; - this.DonateMenuItem.Size = new System.Drawing.Size(143, 22); - this.DonateMenuItem.Text = "&Donate"; - this.DonateMenuItem.Click += new System.EventHandler(this.DonateMenuItem_Click); - // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; @@ -324,15 +316,6 @@ private void InitializeComponent() this.labelCalc.Text = "Preparing Synchronization"; this.labelCalc.Visible = false; // - // webBrowser1 - // - this.webBrowser1.Location = new System.Drawing.Point(-200, -200); - this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20); - this.webBrowser1.Name = "webBrowser1"; - this.webBrowser1.Size = new System.Drawing.Size(100, 85); - this.webBrowser1.TabIndex = 4; - this.webBrowser1.Navigated += new System.Windows.Forms.WebBrowserNavigatedEventHandler(this.webBrowser1_Navigated); - // // statusStrip1 // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -637,7 +620,6 @@ private void InitializeComponent() this.ClientSize = new System.Drawing.Size(933, 518); this.Controls.Add(this.toolStripContainer1); this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.webBrowser1); this.Controls.Add(this.labelCalc); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; @@ -685,7 +667,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem preferencesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem1; - private System.Windows.Forms.WebBrowser webBrowser1; private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripStatusLabel labelStatus; diff --git a/MainApp/FlickrSync.cs b/MainApp/FlickrSync.cs index 36654dd..f215403 100644 --- a/MainApp/FlickrSync.cs +++ b/MainApp/FlickrSync.cs @@ -26,11 +26,9 @@ public enum LogLevel { LogNone = 0, LogBasic, LogAll, LogDebug }; static public LocalInfo li; static public RemoteInfo ri; static public string user; - static public bool message_tested=false; static public bool autorun = false; static public MessagesLevel messages_level = MessagesLevel.MessagesAll; static public LogLevel log_level = LogLevel.LogNone; - static public ArrayList HashUsers; Point MouseDownPos; static private SyncPropertiesStatus syncprop_status=SyncPropertiesStatus.Default; @@ -134,15 +132,6 @@ public static LogLevel StringToLogLevel(string str) #region Initial Load private void FlickrSync_Load(object sender, EventArgs e) { - // probably not needed but just to make sure no message from previous versions is shown - if (Properties.Settings.Default.MessageId.CompareTo("090130_0000")<0) - { - Properties.Settings.Default.MessageId = "090130_0000"; - Properties.Settings.Default.Save(); - } - - HashUsers = new ArrayList(); - string token=""; try { token=Properties.Settings.Default.FlickrToken; @@ -172,17 +161,6 @@ private void FlickrSync_Load(object sender, EventArgs e) else WindowState = FormWindowState.Maximized; - if (!message_tested) - { - try - { - webBrowser1.Navigate(Properties.Settings.Default.MessageUrl + "?version=" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()); - } - catch (Exception) - { - } - } - if (autorun) { ViewAndSync(); @@ -1167,73 +1145,6 @@ private void organizeSetOnFlickrToolStripMenuItem_Click(object sender, EventArgs if (lvi != null) Process.Start(ri.GetPhotosetEditURL(lvi.Name)); } - - private void DonateMenuItem_Click(object sender, EventArgs e) - { - MessageBox.Show("To donate, please use Paypal. Any donation is welcomed to support future FlickrSync development and costs. If you donate, please send an email to flickrsync@gmail.com and any further donation requests will be hidden.\nThanks\nFlickrSync Team"); - Process.Start(Properties.Settings.Default.DonateUrl); - } - #endregion - - #region Check out Messages - private string FindParam(string doc, string str) - { - try - { - int pos = doc.IndexOf(str); - if (pos < 0) return ""; - pos += str.Length; - - int pos2 = doc.IndexOf('"', pos); - if (pos2 < 0) return ""; - - return doc.Substring(pos, pos2 - pos); - } - catch (Exception) - { - return ""; - } - } - - private void webBrowser1_Navigated(object sender, WebBrowserNavigatedEventArgs e) - { - try - { - FlickrSync.message_tested = true; - - string mess_id = FindParam(webBrowser1.DocumentText, @"0) - { - Properties.Settings.Default.MessageId = mess_id; - Properties.Settings.Default.Save(); - - if (mess_text != "" && mess_text != "none") - { - if (messages_level!=MessagesLevel.MessagesNone) - MessageBox.Show(mess_text, "FlickrSync Information"); - } - else - { - System.Diagnostics.Process.Start(Properties.Settings.Default.MessageUrl); - Thread.Sleep(10000); - } - } - } - catch (Exception) - { - } - } - #endregion - - } } diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 36e63a1..1ac20b7 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -137,27 +137,6 @@ public string HelpProperties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("090130_0000")] - public string MessageId { - get { - return ((string)(this["MessageId"])); - } - set { - this["MessageId"] = value; - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://flickrsync.freehostia.com/message.htm")] - public string MessageUrl { - get { - return ((string)(this["MessageUrl"])); - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] @@ -277,23 +256,5 @@ public string OrderType { this["OrderType"] = value; } } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://flickrsync.freehostia.com/ad.htm")] - public string AdUrl { - get { - return ((string)(this["AdUrl"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://flickrsync.freehostia.com/donate.htm")] - public string DonateUrl { - get { - return ((string)(this["DonateUrl"])); - } - } } } diff --git a/Properties/Settings.settings b/Properties/Settings.settings index 4102452..6e8a03f 100644 --- a/Properties/Settings.settings +++ b/Properties/Settings.settings @@ -41,12 +41,6 @@ http://flickrsync.freehostia.com/index_properties.htm - - 090130_0000 - - - http://flickrsync.freehostia.com/message.htm - True @@ -77,11 +71,5 @@ OrderDefault - - http://flickrsync.freehostia.com/ad.htm - - - http://flickrsync.freehostia.com/donate.htm - \ No newline at end of file diff --git a/Sync/SyncView.Designer.cs b/Sync/SyncView.Designer.cs index 487d060..58b9f0e 100644 --- a/Sync/SyncView.Designer.cs +++ b/Sync/SyncView.Designer.cs @@ -37,7 +37,6 @@ private void InitializeComponent() this.progressBarSync = new System.Windows.Forms.ProgressBar(); this.progressBarPhoto = new System.Windows.Forms.ProgressBar(); this.labelSync = new System.Windows.Forms.Label(); - this.webBrowserAds = new System.Windows.Forms.WebBrowser(); this.SuspendLayout(); // // listViewToSync @@ -111,23 +110,6 @@ private void InitializeComponent() this.labelSync.Size = new System.Drawing.Size(483, 19); this.labelSync.TabIndex = 5; // - // webBrowserAds - // - this.webBrowserAds.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.webBrowserAds.Location = new System.Drawing.Point(3, 218); - this.webBrowserAds.MaximumSize = new System.Drawing.Size(0, 70); - this.webBrowserAds.MinimumSize = new System.Drawing.Size(20, 70); - this.webBrowserAds.Name = "webBrowserAds"; - this.webBrowserAds.ScriptErrorsSuppressed = true; - this.webBrowserAds.ScrollBarsEnabled = false; - this.webBrowserAds.Size = new System.Drawing.Size(485, 70); - this.webBrowserAds.TabIndex = 6; - this.webBrowserAds.TabStop = false; - this.webBrowserAds.Url = new System.Uri("http://flickrsync.freehostia.com/ad.htm", System.UriKind.Absolute); - this.webBrowserAds.Visible = false; - this.webBrowserAds.Navigating += new System.Windows.Forms.WebBrowserNavigatingEventHandler(this.webBrowserAds_Navigating); - // // SyncView // this.AcceptButton = this.buttonSync; @@ -135,7 +117,6 @@ private void InitializeComponent() this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.buttonCancel; this.ClientSize = new System.Drawing.Size(491, 378); - this.Controls.Add(this.webBrowserAds); this.Controls.Add(this.labelSync); this.Controls.Add(this.progressBarPhoto); this.Controls.Add(this.progressBarSync); @@ -161,6 +142,5 @@ private void InitializeComponent() private System.Windows.Forms.ProgressBar progressBarPhoto; private System.Windows.Forms.Label labelSync; private System.Windows.Forms.ImageList imageList1; - private System.Windows.Forms.WebBrowser webBrowserAds; } } \ No newline at end of file diff --git a/Sync/SyncView.cs b/Sync/SyncView.cs index 5d242ba..d79a717 100644 --- a/Sync/SyncView.cs +++ b/Sync/SyncView.cs @@ -30,7 +30,6 @@ struct ThumbnailTask ArrayList SyncFolders; ArrayList SyncItems; static DateTime SyncDate; - string AdsUrlPath; bool SyncStarted = false; bool SyncAborted = false; @@ -55,7 +54,6 @@ public SyncView(ArrayList pSyncFolders) Tasks = new ArrayList(); NewSets = new ArrayList(); SyncFolders = pSyncFolders; - AdsUrlPath = ""; CalcSync(); } @@ -101,7 +99,7 @@ private void UpdateThumbnails() try { bm = new Bitmap(tt.org); - //bmSize = ThumbnailSize*2; + //bmSize = ThumbnailSize*2; if (bm == null) continue; @@ -1241,32 +1239,6 @@ private void buttonSync_Click(object sender, EventArgs e) labelSync.Text = "Synchronizing. Please Wait..."; buttonSync.Visible=false; - //show ads - bool show=true; - string hash = FlickrSync.ri.UserId().GetHashCode().ToString("X"); - foreach (string str in FlickrSync.HashUsers) - { - if (str == hash) - { - show = false; - break; - } - - if (str == "VERSION" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version) - { - show = false; - break; - } - } - - if (show) - { - webBrowserAds.Height = 70; - webBrowserAds.Width = listViewToSync.Width; - webBrowserAds.Visible = true; - listViewToSync.Height = listViewToSync.Height - webBrowserAds.Height - 5; - } - this.Text = "FlickrSync Synchronizing...0%"; ThreadStart ts = new ThreadStart(ExecuteSync); @@ -1313,17 +1285,5 @@ private void listViewToSync_DrawItem(object sender, DrawListViewItemEventArgs e) e.Graphics.DrawString(e.Item.Text, listViewToSync.Font, new SolidBrush(e.Item.ForeColor), r2, fmt); } } - - private void webBrowserAds_Navigating(object sender, WebBrowserNavigatingEventArgs e) - { - if (webBrowserAds.Visible && e.Url.ToString()!=Properties.Settings.Default.AdUrl && e.Url.LocalPath!=AdsUrlPath) - { - e.Cancel = true; - System.Diagnostics.Process.Start(e.Url.ToString()); - } - - if (AdsUrlPath == "") - AdsUrlPath = e.Url.LocalPath; - } } } diff --git a/app.config b/app.config index e2b5cc8..028d0cc 100644 --- a/app.config +++ b/app.config @@ -10,92 +10,82 @@ - - - - - <FlickrSync></FlickrSync> - - - SyncFilename - - - False - - - False - - - 090130_0000 - - - True - - - - - - - - - - - - - - - False - - - MessagesAll - - - LogNone - - - - - - OrderDefault - - + + + + + <FlickrSync></FlickrSync> + + + SyncFilename + + + False + + + False + + + True + + + + + + + + + + + + + + + False + + + MessagesAll + + + LogNone + + + + + + OrderDefault + + - - 99835d77b01b776f3115b56180c6c4f4 - - - 3433f92c86ec38f3 - - - - - jpg - jpeg - gif - png - tif - tiff - bmp - - - - - http://flickrsync.freehostia.com/index.htm - - - http://flickrsync.freehostia.com/index_properties.htm - - - http://flickrsync.freehostia.com/message.htm - - - http://flickrsync.freehostia.com/ad.htm - - - http://flickrsync.freehostia.com/donate.htm - - + + 99835d77b01b776f3115b56180c6c4f4 + + + 3433f92c86ec38f3 + + + + + jpg + jpeg + gif + png + tif + tiff + bmp + + + + + http://flickrsync.freehostia.com/index.htm + + + http://flickrsync.freehostia.com/index_properties.htm + + - + +