diff --git a/NAPS2.sln b/NAPS2.sln index bda6fec16f..07abfc94ba 100644 --- a/NAPS2.sln +++ b/NAPS2.sln @@ -9,33 +9,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F6CC4F EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - CD_ROM|Any CPU = CD_ROM|Any CPU Debug|Any CPU = Debug|Any CPU - DVD-5|Any CPU = DVD-5|Any CPU Release|Any CPU = Release|Any CPU - SingleImage|Any CPU = SingleImage|Any CPU + Standalone|Any CPU = Standalone|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU - {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.CD_ROM|Any CPU.Build.0 = Release|Any CPU {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU - {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.DVD-5|Any CPU.Build.0 = Debug|Any CPU {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.Release|Any CPU.ActiveCfg = Release|Any CPU {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.Release|Any CPU.Build.0 = Release|Any CPU - {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU - {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.SingleImage|Any CPU.Build.0 = Release|Any CPU - {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU - {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.CD_ROM|Any CPU.Build.0 = Release|Any CPU - {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU - {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.DVD-5|Any CPU.Build.0 = Debug|Any CPU + {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.Standalone|Any CPU.ActiveCfg = Standalone|Any CPU + {EAC4A133-93BE-4400-BFA9-CEB1615693C4}.Standalone|Any CPU.Build.0 = Standalone|Any CPU + {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.Debug|Any CPU.ActiveCfg = Release|Any CPU + {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.Debug|Any CPU.Build.0 = Release|Any CPU {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.Release|Any CPU.ActiveCfg = Release|Any CPU {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.Release|Any CPU.Build.0 = Release|Any CPU - {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU - {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.SingleImage|Any CPU.Build.0 = Release|Any CPU + {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.Standalone|Any CPU.ActiveCfg = Debug|Any CPU + {11FC4BE1-882D-4ABA-8781-2F3F77DF9453}.Standalone|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/NAPS2/FChooseIcon.Designer.cs b/NAPS2/FChooseIcon.Designer.cs index 068ae8169b..da36c6e30a 100644 --- a/NAPS2/FChooseIcon.Designer.cs +++ b/NAPS2/FChooseIcon.Designer.cs @@ -48,6 +48,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FChooseIcon)); this.iconList = new System.Windows.Forms.ListView(); this.ilProfileIcons = new NAPS2.ILProfileIcons(this.components); this.SuspendLayout(); @@ -70,8 +71,9 @@ private void InitializeComponent() this.ClientSize = new System.Drawing.Size(316, 302); this.Controls.Add(this.iconList); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "FChooseIcon"; - this.Text = "FChooseIcon"; + this.Text = "Choose Icon"; this.Load += new System.EventHandler(this.FChooseIcon_Load); this.ResumeLayout(false); diff --git a/NAPS2/FChooseIcon.resx b/NAPS2/FChooseIcon.resx index bc18b6c13a..e8891b6c19 100644 --- a/NAPS2/FChooseIcon.resx +++ b/NAPS2/FChooseIcon.resx @@ -120,4 +120,29 @@ 17, 17 + + + + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAFxcXPldXV6RYWFilV1dXpFZWVqRUVFSkVFRUpFRUVKRSUlKkUlJSpFRSVKRcVlymRkRGnQAA + AC8AAAAAAAAAAI2NjcHm5ub/3t7e/97e3v/d3d3/3d3d/9/f3//f39//3Nzc/93c3f/Y2tj/pNKk/8rY + yv9KSEqZAAAAAAAAAAChoaHN5+jo/+Hj5f/g4uT/6Orr//n6/P/+/////f////T29//l5un/097X/2vO + bv+63Lr/ZWBlpAAAAAAAAAAAsLCwzf36+P/l1s//49TM/+ja0v/s39j/697Z/+ve2P/r3tf/5tjQ/+PU + zP/t3t3//////2NjY6IAAAAAAAAAAKKjprLx18H/7MGL//XWpP/44rb/+enD//nt0f/568z/+ea7//bc + rf/00Zz/57uL//Hl4P9KTE6DAAAAAAAAAABnaW1z8NfD//LIj//74bX//uvH///xzf//8MT//+2+//3n + t//63qr/+NOZ/+q8i//a09D+ExYWQgAAAAAAAAAAMDQ0PuXXzv3uyJ3//ObF//zoyv/87ND//OvL//rg + sv/316H/9s+W//PEhf/txZ//s7K03gAAABAAAAAAAAAAAAAPDxHOysjl5byb//zkw//75sn/++fM//vp + z//758n/+N20//bTpP/uv4v/7s+2/4eKjLAAAAAAAAAAAAAAAAAAAAAAmpueqe7Lr//217P/++TI//vl + yf/75sr/++bK//vlyv/85cr/7cSe/+nVyv9RU1V/AAAAAAAAAAAAAAAAAAAAAFhbXV7s3tX/5MOq/+fN + t//nzrj/5865/+fOuP/nzbf/58y1/+XHsP/NysjtExMTMQAAAAAAAAAAAAAAAAAAAAAREREsu7y987Gx + s/+kpKX/paWm/6Wlpv+lpab/paWm/6SjpP/Lzc//cnJzvAAAAAEAAAAAAAAAAAAAAAAAAAAAV1dXfNDQ + 0P+JiYr/iYmK/4qKi/+Kiov/ioqL/4qKi/+Hh4j/pqam/7e3t/YEBAQ4AAAAAAAAAAAAAAAAAAAAELCw + sNm3t7f/mpqa/56env+enp7/np6e/56env+enp7/np6e/5qamv/S0tL/SUlJkwAAAAAAAAAAAAAAADo6 + Olb09PT/ra2t/6mpqf+oqKj/p6en/6enp/+np6f/p6en/6qqqv+lpaX/2dnZ/6qqqt8AAAAXAAAAAAAA + AABLS0tT8/Pz/O7u7vzn5+f69PT0//j4+P/39/f/+Pj4//r6+v/s7Oz95OTk+vj4+P+enp7JAAAADQAA + AAAAAAAAAAAAAZKSkiaNjY00c3NzMKampqHi4uLl2dnZ3tnZ2eDKysrbS0tLYUhISC1KSkozDQ0NEwAA + AAAAAAAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIADAADAAwAAwAMAAMADAADAAwAAgAMAAIAB + AACAAQAAgAMAAA== + + \ No newline at end of file diff --git a/NAPS2/FChooseProfile.resx b/NAPS2/FChooseProfile.resx index 5f1e1aca8c..e8891b6c19 100644 --- a/NAPS2/FChooseProfile.resx +++ b/NAPS2/FChooseProfile.resx @@ -124,25 +124,25 @@ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATk1N/05OTu8AAAAAWFdX/1hXV/9OTU3vAAAAAFlX - V/9DQ0P/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAb21t/8z29v/Z+Pj/WlhY/7Lu9/+y7vf/etH3/1pY - WP9aWFj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIeEhP+o+vv/p////1W9//8Jhf//CYX//zi3 - //8Skf//abTY/1pYWO9DQ0PvZmZm/wAAAABmZmb/ZmZm/wAAAAAAAAAAWlhY/2/p//8opv//EpH//xKR - //8amv//Bo///2Ww2P9jYGD/AAAAAGZmZv9mZmb///jn//np0/9mZmb/e3l3/6vx/v9Mtf//S7T//z6v - //8+r///Oa3//xef//9aWFj/AAAAAGZmZv/j1bv//+3C///wy//Ng1L/mT4N/4N9ev/C7///n+H//4zV - //+J1P//idT//2nJ//9AsPH/ZLrp/09OTt9bWlrv7tm8///mrf//6LH/yHQ5/6BRH/+gUR//hH98/8Ls - //+/6///v+v//7/r//+85/z/abHh/3nL+P9YV1f/AAAAAGZmZv/tuIL/zHtB/8x7Qf+vbDz/hH98/9nt - +f/b7vn/4/H5/8/o+P/P6Pj/uN/4/7bk//9aWFj/AAAAAGZmZv/85M3/7reG/9uYY//bmGP/vYVZ/3p2 - c//a8P//zuz//87s///N6///zev//83r///M6f//1en7/0NDQ+9mZmb/48q2//zMp//0w5r/57SF/7+X - cv+gUR//4vL//1pYWP/Y7v//2O7//9ju//9aWFj/1uv+/93s+v9bWlrvAAAAAGZmZv/z0a7/89Gv//PR - rv/GrJH/WFZV/35+fv/Rk2v/h4aG/35+fv9+fn7/AAAAAHFxcf+Ih4f/AAAAAGZmZv/n1cv//riN//ez - h//3sof//riM//62iv/+sof//q6C//vPuP9ZWVn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZmZm//+9 - mv//vpr//76a//+9mf//u5f//7mV//+2kv/91cP/ZmZm/wAAAAAAAAAAAAAAAAAAAAAAAAAAZmZm//Pk - 3f/z5N3/ZmZm/2ZmZv//8Oj/6NjQ/2ZmZv/n1s//8ujk/09OTv8AAAAAAAAAAAAAAAAAAAAAAAAAAGZm - Zv9mZmb/UFBQ7wAAAAAAAAAAT09P/0NDQ98AAAAAQ0ND31xcXO8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/kQAAPwBAAD8AAAAJgAAAIABAAAAAAAAAAAAAIABAAAAAAAAAAAAAIAJAAAAHwAAgB8AAAAf - AAAZPwAA//8AAA== + AAAAAAAAFxcXPldXV6RYWFilV1dXpFZWVqRUVFSkVFRUpFRUVKRSUlKkUlJSpFRSVKRcVlymRkRGnQAA + AC8AAAAAAAAAAI2NjcHm5ub/3t7e/97e3v/d3d3/3d3d/9/f3//f39//3Nzc/93c3f/Y2tj/pNKk/8rY + yv9KSEqZAAAAAAAAAAChoaHN5+jo/+Hj5f/g4uT/6Orr//n6/P/+/////f////T29//l5un/097X/2vO + bv+63Lr/ZWBlpAAAAAAAAAAAsLCwzf36+P/l1s//49TM/+ja0v/s39j/697Z/+ve2P/r3tf/5tjQ/+PU + zP/t3t3//////2NjY6IAAAAAAAAAAKKjprLx18H/7MGL//XWpP/44rb/+enD//nt0f/568z/+ea7//bc + rf/00Zz/57uL//Hl4P9KTE6DAAAAAAAAAABnaW1z8NfD//LIj//74bX//uvH///xzf//8MT//+2+//3n + t//63qr/+NOZ/+q8i//a09D+ExYWQgAAAAAAAAAAMDQ0PuXXzv3uyJ3//ObF//zoyv/87ND//OvL//rg + sv/316H/9s+W//PEhf/txZ//s7K03gAAABAAAAAAAAAAAAAPDxHOysjl5byb//zkw//75sn/++fM//vp + z//758n/+N20//bTpP/uv4v/7s+2/4eKjLAAAAAAAAAAAAAAAAAAAAAAmpueqe7Lr//217P/++TI//vl + yf/75sr/++bK//vlyv/85cr/7cSe/+nVyv9RU1V/AAAAAAAAAAAAAAAAAAAAAFhbXV7s3tX/5MOq/+fN + t//nzrj/5865/+fOuP/nzbf/58y1/+XHsP/NysjtExMTMQAAAAAAAAAAAAAAAAAAAAAREREsu7y987Gx + s/+kpKX/paWm/6Wlpv+lpab/paWm/6SjpP/Lzc//cnJzvAAAAAEAAAAAAAAAAAAAAAAAAAAAV1dXfNDQ + 0P+JiYr/iYmK/4qKi/+Kiov/ioqL/4qKi/+Hh4j/pqam/7e3t/YEBAQ4AAAAAAAAAAAAAAAAAAAAELCw + sNm3t7f/mpqa/56env+enp7/np6e/56env+enp7/np6e/5qamv/S0tL/SUlJkwAAAAAAAAAAAAAAADo6 + Olb09PT/ra2t/6mpqf+oqKj/p6en/6enp/+np6f/p6en/6qqqv+lpaX/2dnZ/6qqqt8AAAAXAAAAAAAA + AABLS0tT8/Pz/O7u7vzn5+f69PT0//j4+P/39/f/+Pj4//r6+v/s7Oz95OTk+vj4+P+enp7JAAAADQAA + AAAAAAAAAAAAAZKSkiaNjY00c3NzMKampqHi4uLl2dnZ3tnZ2eDKysrbS0tLYUhISC1KSkozDQ0NEwAA + AAAAAAAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIADAADAAwAAwAMAAMADAADAAwAAgAMAAIAB + AACAAQAAgAMAAA== \ No newline at end of file diff --git a/NAPS2/FEditScanSettings.resx b/NAPS2/FEditScanSettings.resx index 8331906b97..caba9628fc 100644 --- a/NAPS2/FEditScanSettings.resx +++ b/NAPS2/FEditScanSettings.resx @@ -184,25 +184,25 @@ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC0WAzalbwa4VjMEcgAAAQVNIwRjFQoCJgAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwECDgAAAABdNwZp/9oB/+WTBPOQUwar+80D/798 - BNkTBAEhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALxcENb18CNKBTQeczpcF2/+tAP//kwD//8gA///D - AP//lgP/bi8GjwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJNVCZT/vwH//7UC//+7AP//nwH//6II//+m - Cv//lgL//50A//OfA/9DHgNdAAAAAAAAAAAAAAAAAAAAAAAAAABXJgNZ/5YC//+hAP//qAz/048jzoZg - IYF6WCBz0pImzv+nB///qgD/g0EFlQAAAAAAAAAAAAAAAAAAAABZNSKFjVg22/yXAf/8rBD/i2IhiQgI - CAIAAAAAAAAAAJWJPZD/0jH/0HAA5B0JAioAAAAAAAAAAAAAAAADAAAFFIa1zgzI+v+dk1L/T6ml/wBV - j54AAAIJAAAAABoXCRneyFLc/9g4//CWAPwtEAM/AAAAAAAVKS4AR3aNASxSaQKm4+4AoP//BKf2/wHV - /v8Apv//ACFWdCUTAB2shjO7/cxT//WwH/ubWgKoDgUBEgAAAAAAY5+lAL7//wC0+/8AtP//AJT//wCc - //8AmP//AJf//wSK2u+lflTw+K1A///TLf+VWQeqAAAAAAAAAAAAAAAAAD93gQCg//8Apf//AKD49Emq - svV8tYX+QLC8/gCk//8AoP//hqCD//WqFO/JggjPTCcEVwAAAAAAAAAAADV4fgBh0uMApP//AKbn5QAy - QzxTKgBBhzEAaJKqXfAAz///IJDT/9CiHvpPJwBYAAAAAAUCAQEAAAAAAAAAAABszMgArv//ALv//wBG - WVwAAAAAAAAAAA8LCA8hs73dAN3//wqc7f8eGydUAAAAAAAAAAAAAAAAAAAAAAAAAAAATo+NAKn8/wDE - /v8ANEhbAAABCwAYJS8AcqGvAML//wCm6fMAOm13AAAEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4qKgCF - 8vcA3v//AKvq+gB5zeoAhd34AKr5/wDP//8AY5yxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE - DgoAdLO4AJbW3wDb//8Ayfz/AND//wCe0tsAOGZxABQoLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAeREAAh8rFADtiagBUi4wAJkFHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/wMAAP0BAAD4AQAA+AAAAPgAAADwMAAA4CAAAIAAAACAAwAAgAMAAAALAAAMHwAAAB8AAAB/ - AAAAfwAAwf8AAA== + AAAAAAAAFxcXPldXV6RYWFilV1dXpFZWVqRUVFSkVFRUpFRUVKRSUlKkUlJSpFRSVKRcVlymRkRGnQAA + AC8AAAAAAAAAAI2NjcHm5ub/3t7e/97e3v/d3d3/3d3d/9/f3//f39//3Nzc/93c3f/Y2tj/pNKk/8rY + yv9KSEqZAAAAAAAAAAChoaHN5+jo/+Hj5f/g4uT/6Orr//n6/P/+/////f////T29//l5un/097X/2vO + bv+63Lr/ZWBlpAAAAAAAAAAAsLCwzf36+P/l1s//49TM/+ja0v/s39j/697Z/+ve2P/r3tf/5tjQ/+PU + zP/t3t3//////2NjY6IAAAAAAAAAAKKjprLx18H/7MGL//XWpP/44rb/+enD//nt0f/568z/+ea7//bc + rf/00Zz/57uL//Hl4P9KTE6DAAAAAAAAAABnaW1z8NfD//LIj//74bX//uvH///xzf//8MT//+2+//3n + t//63qr/+NOZ/+q8i//a09D+ExYWQgAAAAAAAAAAMDQ0PuXXzv3uyJ3//ObF//zoyv/87ND//OvL//rg + sv/316H/9s+W//PEhf/txZ//s7K03gAAABAAAAAAAAAAAAAPDxHOysjl5byb//zkw//75sn/++fM//vp + z//758n/+N20//bTpP/uv4v/7s+2/4eKjLAAAAAAAAAAAAAAAAAAAAAAmpueqe7Lr//217P/++TI//vl + yf/75sr/++bK//vlyv/85cr/7cSe/+nVyv9RU1V/AAAAAAAAAAAAAAAAAAAAAFhbXV7s3tX/5MOq/+fN + t//nzrj/5865/+fOuP/nzbf/58y1/+XHsP/NysjtExMTMQAAAAAAAAAAAAAAAAAAAAAREREsu7y987Gx + s/+kpKX/paWm/6Wlpv+lpab/paWm/6SjpP/Lzc//cnJzvAAAAAEAAAAAAAAAAAAAAAAAAAAAV1dXfNDQ + 0P+JiYr/iYmK/4qKi/+Kiov/ioqL/4qKi/+Hh4j/pqam/7e3t/YEBAQ4AAAAAAAAAAAAAAAAAAAAELCw + sNm3t7f/mpqa/56env+enp7/np6e/56env+enp7/np6e/5qamv/S0tL/SUlJkwAAAAAAAAAAAAAAADo6 + Olb09PT/ra2t/6mpqf+oqKj/p6en/6enp/+np6f/p6en/6qqqv+lpaX/2dnZ/6qqqt8AAAAXAAAAAAAA + AABLS0tT8/Pz/O7u7vzn5+f69PT0//j4+P/39/f/+Pj4//r6+v/s7Oz95OTk+vj4+P+enp7JAAAADQAA + AAAAAAAAAAAAAZKSkiaNjY00c3NzMKampqHi4uLl2dnZ3tnZ2eDKysrbS0tLYUhISC1KSkozDQ0NEwAA + AAAAAAAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIADAADAAwAAwAMAAMADAADAAwAAgAMAAIAB + AACAAQAAgAMAAA== \ No newline at end of file diff --git a/NAPS2/FManageProfiles.resx b/NAPS2/FManageProfiles.resx index b18bec5f5b..1e51955571 100644 --- a/NAPS2/FManageProfiles.resx +++ b/NAPS2/FManageProfiles.resx @@ -124,25 +124,25 @@ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATk1N/05OTu8AAAAAWFdX/1hXV/9OTU3vAAAAAFlX - V/9DQ0P/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAb21t/8z29v/Z+Pj/WlhY/7Lu9/+y7vf/etH3/1pY - WP9aWFj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIeEhP+o+vv/p////1W9//8Jhf//CYX//zi3 - //8Skf//abTY/1pYWO9DQ0PvZmZm/wAAAABmZmb/ZmZm/wAAAAAAAAAAWlhY/2/p//8opv//EpH//xKR - //8amv//Bo///2Ww2P9jYGD/AAAAAGZmZv9mZmb///jn//np0/9mZmb/e3l3/6vx/v9Mtf//S7T//z6v - //8+r///Oa3//xef//9aWFj/AAAAAGZmZv/j1bv//+3C///wy//Ng1L/mT4N/4N9ev/C7///n+H//4zV - //+J1P//idT//2nJ//9AsPH/ZLrp/09OTt9bWlrv7tm8///mrf//6LH/yHQ5/6BRH/+gUR//hH98/8Ls - //+/6///v+v//7/r//+85/z/abHh/3nL+P9YV1f/AAAAAGZmZv/tuIL/zHtB/8x7Qf+vbDz/hH98/9nt - +f/b7vn/4/H5/8/o+P/P6Pj/uN/4/7bk//9aWFj/AAAAAGZmZv/85M3/7reG/9uYY//bmGP/vYVZ/3p2 - c//a8P//zuz//87s///N6///zev//83r///M6f//1en7/0NDQ+9mZmb/48q2//zMp//0w5r/57SF/7+X - cv+gUR//4vL//1pYWP/Y7v//2O7//9ju//9aWFj/1uv+/93s+v9bWlrvAAAAAGZmZv/z0a7/89Gv//PR - rv/GrJH/WFZV/35+fv/Rk2v/h4aG/35+fv9+fn7/AAAAAHFxcf+Ih4f/AAAAAGZmZv/n1cv//riN//ez - h//3sof//riM//62iv/+sof//q6C//vPuP9ZWVn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZmZm//+9 - mv//vpr//76a//+9mf//u5f//7mV//+2kv/91cP/ZmZm/wAAAAAAAAAAAAAAAAAAAAAAAAAAZmZm//Pk - 3f/z5N3/ZmZm/2ZmZv//8Oj/6NjQ/2ZmZv/n1s//8ujk/09OTv8AAAAAAAAAAAAAAAAAAAAAAAAAAGZm - Zv9mZmb/UFBQ7wAAAAAAAAAAT09P/0NDQ98AAAAAQ0ND31xcXO8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/kQAAPwBAAD8AAAAJgAAAIABAAAAAAAAAAAAAIABAAAAAAAAAAAAAIAJAAAAHwAAgB8AAAAf - AAAZPwAA//8AAA== + AAAAAAAAFxcXPldXV6RYWFilV1dXpFZWVqRUVFSkVFRUpFRUVKRSUlKkUlJSpFRSVKRcVlymRkRGnQAA + AC8AAAAAAAAAAI2NjcHm5ub/3t7e/97e3v/d3d3/3d3d/9/f3//f39//3Nzc/93c3f/Y2tj/pNKk/8rY + yv9KSEqZAAAAAAAAAAChoaHN5+jo/+Hj5f/g4uT/6Orr//n6/P/+/////f////T29//l5un/097X/2vO + bv+63Lr/ZWBlpAAAAAAAAAAAsLCwzf36+P/l1s//49TM/+ja0v/s39j/697Z/+ve2P/r3tf/5tjQ/+PU + zP/t3t3//////2NjY6IAAAAAAAAAAKKjprLx18H/7MGL//XWpP/44rb/+enD//nt0f/568z/+ea7//bc + rf/00Zz/57uL//Hl4P9KTE6DAAAAAAAAAABnaW1z8NfD//LIj//74bX//uvH///xzf//8MT//+2+//3n + t//63qr/+NOZ/+q8i//a09D+ExYWQgAAAAAAAAAAMDQ0PuXXzv3uyJ3//ObF//zoyv/87ND//OvL//rg + sv/316H/9s+W//PEhf/txZ//s7K03gAAABAAAAAAAAAAAAAPDxHOysjl5byb//zkw//75sn/++fM//vp + z//758n/+N20//bTpP/uv4v/7s+2/4eKjLAAAAAAAAAAAAAAAAAAAAAAmpueqe7Lr//217P/++TI//vl + yf/75sr/++bK//vlyv/85cr/7cSe/+nVyv9RU1V/AAAAAAAAAAAAAAAAAAAAAFhbXV7s3tX/5MOq/+fN + t//nzrj/5865/+fOuP/nzbf/58y1/+XHsP/NysjtExMTMQAAAAAAAAAAAAAAAAAAAAAREREsu7y987Gx + s/+kpKX/paWm/6Wlpv+lpab/paWm/6SjpP/Lzc//cnJzvAAAAAEAAAAAAAAAAAAAAAAAAAAAV1dXfNDQ + 0P+JiYr/iYmK/4qKi/+Kiov/ioqL/4qKi/+Hh4j/pqam/7e3t/YEBAQ4AAAAAAAAAAAAAAAAAAAAELCw + sNm3t7f/mpqa/56env+enp7/np6e/56env+enp7/np6e/5qamv/S0tL/SUlJkwAAAAAAAAAAAAAAADo6 + Olb09PT/ra2t/6mpqf+oqKj/p6en/6enp/+np6f/p6en/6qqqv+lpaX/2dnZ/6qqqt8AAAAXAAAAAAAA + AABLS0tT8/Pz/O7u7vzn5+f69PT0//j4+P/39/f/+Pj4//r6+v/s7Oz95OTk+vj4+P+enp7JAAAADQAA + AAAAAAAAAAAAAZKSkiaNjY00c3NzMKampqHi4uLl2dnZ3tnZ2eDKysrbS0tLYUhISC1KSkozDQ0NEwAA + AAAAAAAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIADAADAAwAAwAMAAMADAADAAwAAgAMAAIAB + AACAAQAAgAMAAA== \ No newline at end of file diff --git a/NAPS2/FViewer.cs b/NAPS2/FViewer.cs index 47dbf9393a..5eb29b406c 100644 --- a/NAPS2/FViewer.cs +++ b/NAPS2/FViewer.cs @@ -61,8 +61,8 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - var resources = new System.Resources.ResourceManager(typeof(FViewer)); - this.tiffViewer1 = new TiffViewerCtl(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FViewer)); + this.tiffViewer1 = new NAPS2.TiffViewerCtl(); this.SuspendLayout(); // // tiffViewer1 diff --git a/NAPS2/FViewer.resx b/NAPS2/FViewer.resx index fadbc5c7d9..cc3c7c77e1 100644 --- a/NAPS2/FViewer.resx +++ b/NAPS2/FViewer.resx @@ -3,7 +3,7 @@ + + + + + + + + + + + + + + + + + + - + + @@ -89,75 +109,37 @@ text/microsoft-resx - 1.3 + 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False - - - Private - - - Private - - - False - - - (Default) - - - False - - - False - - - 8, 8 - - - True - - - 80 - - - True - - - Private - - - FViewer - - + + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIGyg1SV9yqS8m - JlEAAAAAAAAAABYPDyQaEhIzGxISMRsTEzEbExMxGhISMRoSEjEaERExGxERMhYIBiMJHy5CcbjU44fg - //8xT2qVAAAAAAAAAAChiIjH6+Dg/+PX1/rf0ND63s/P+t7Nz/rcy8v63czM+uLQz/uUna3ueMLd8HbY - //8ZcarDAAsVGwAAAAAAAAAAsJyczP/////89/f/6dvd/9/O0P/Ww8L/18PD/+vc3P/p5en/iM3s/2TN - /v9OksX7GhgdQgAAAAAAAAAAAAAAALGcnMz27ez/3MrM/8u0q//byqr/7efA/+bgx//MvLP/tJmY/5ad - rP+Dwuv/3M3Q/zQgHk4AAAAAAAAAAAAAAACwnJzM9Ovt/9S9s//x2ab///a8////0v///+j////5/9jP - yv+6m5n//fDu/+nW1f8vHx9PAAAAAAAAAAAAAAAAsp+fzO/l6P/jx6T//uSm//3uuP///tL////i//// - 8f/8/O//yrOu//Po6f/k09P/LyAgTwAAAAAAAAAAAAAAALKgoczy6Oj/68yi//3orf/98sX///nN//// - 2f///93////g/9XFuP/v4+X/49HR/y8gIE8AAAAAAAAAAAAAAACyoaHM9O3v/+rLqP/+6q7////i//74 - 1v/+9sP///vG//38yf/QurD/7+Pk/+LPz/8vISFPAAAAAAAAAAAAAAAAs6GhzPfx8//l0sn/99ek//7s - sv/97rb//eWq///qsP/s3sH/0rm7/+7h4f/hzc3/MCEhTwAAAAAAAAAAAAAAALOiosz37+7/5NbY/+TQ - yf/w07P/9dmu//DWr//gy7f/2svM/9K6uv/t4OD/4MzM/zAiIk8AAAAAAAAAAAAAAAC0o6PM9ezs/+LR - 0P/j09T/49XY/+/l5v/f0dL/7+ns/9nHx//Uv7//7+Tk/+HMzP8yJCRQAAAAAAAAAAAAAAAAtKSkzPz3 - 9//t4uL/7OHh/+zf3//y6+v/5tvb/+7l5f/Pubn/3M3N/+XW1v/LsbH3JhwcOwAAAAAAAAAAAAAAALel - pcz//////v39//r39//38vL/7ePj/9K9vf/k19f/3s7O//z4+P/l1tb8TT8/ZwAAAAAAAAAAAAAAAAAA - AAA8MDBOQjY2Xohzc7Pw4uL/6t/f/+fb2//w6Oj//////+fZ2f/ay8v2QTc3VwAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAABfT09v6dbW8t/Pz+Pezs7j28rK49rFxeXEq6viQTU1WAAAAAAAAAAAAAAAAAAA - AAAAAAAA//EAAIABAACAAQAAgAMAAIADAACAAwAAgAMAAIADAACAAwAAgAMAAIADAACAAwAAgAMAAIAH - AACADwAA4B8AAA== + AAAAAAAAFxcXPldXV6RYWFilV1dXpFZWVqRUVFSkVFRUpFRUVKRSUlKkUlJSpFRSVKRcVlymRkRGnQAA + AC8AAAAAAAAAAI2NjcHm5ub/3t7e/97e3v/d3d3/3d3d/9/f3//f39//3Nzc/93c3f/Y2tj/pNKk/8rY + yv9KSEqZAAAAAAAAAAChoaHN5+jo/+Hj5f/g4uT/6Orr//n6/P/+/////f////T29//l5un/097X/2vO + bv+63Lr/ZWBlpAAAAAAAAAAAsLCwzf36+P/l1s//49TM/+ja0v/s39j/697Z/+ve2P/r3tf/5tjQ/+PU + zP/t3t3//////2NjY6IAAAAAAAAAAKKjprLx18H/7MGL//XWpP/44rb/+enD//nt0f/568z/+ea7//bc + rf/00Zz/57uL//Hl4P9KTE6DAAAAAAAAAABnaW1z8NfD//LIj//74bX//uvH///xzf//8MT//+2+//3n + t//63qr/+NOZ/+q8i//a09D+ExYWQgAAAAAAAAAAMDQ0PuXXzv3uyJ3//ObF//zoyv/87ND//OvL//rg + sv/316H/9s+W//PEhf/txZ//s7K03gAAABAAAAAAAAAAAAAPDxHOysjl5byb//zkw//75sn/++fM//vp + z//758n/+N20//bTpP/uv4v/7s+2/4eKjLAAAAAAAAAAAAAAAAAAAAAAmpueqe7Lr//217P/++TI//vl + yf/75sr/++bK//vlyv/85cr/7cSe/+nVyv9RU1V/AAAAAAAAAAAAAAAAAAAAAFhbXV7s3tX/5MOq/+fN + t//nzrj/5865/+fOuP/nzbf/58y1/+XHsP/NysjtExMTMQAAAAAAAAAAAAAAAAAAAAAREREsu7y987Gx + s/+kpKX/paWm/6Wlpv+lpab/paWm/6SjpP/Lzc//cnJzvAAAAAEAAAAAAAAAAAAAAAAAAAAAV1dXfNDQ + 0P+JiYr/iYmK/4qKi/+Kiov/ioqL/4qKi/+Hh4j/pqam/7e3t/YEBAQ4AAAAAAAAAAAAAAAAAAAAELCw + sNm3t7f/mpqa/56env+enp7/np6e/56env+enp7/np6e/5qamv/S0tL/SUlJkwAAAAAAAAAAAAAAADo6 + Olb09PT/ra2t/6mpqf+oqKj/p6en/6enp/+np6f/p6en/6qqqv+lpaX/2dnZ/6qqqt8AAAAXAAAAAAAA + AABLS0tT8/Pz/O7u7vzn5+f69PT0//j4+P/39/f/+Pj4//r6+v/s7Oz95OTk+vj4+P+enp7JAAAADQAA + AAAAAAAAAAAAAZKSkiaNjY00c3NzMKampqHi4uLl2dnZ3tnZ2eDKysrbS0tLYUhISC1KSkozDQ0NEwAA + AAAAAAAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIADAADAAwAAwAMAAMADAADAAwAAgAMAAIAB + AACAAQAAgAMAAA== \ No newline at end of file diff --git a/NAPS2/NAPS2.csproj b/NAPS2/NAPS2.csproj index 5068b1b1dd..38bda2eda9 100644 --- a/NAPS2/NAPS2.csproj +++ b/NAPS2/NAPS2.csproj @@ -42,7 +42,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG prompt 4 AnyCPU @@ -67,13 +67,19 @@ false + + bin\Standalone\ + TRACE;STANDALONE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + ..\packages\Ninject.3.0.1.10\lib\net35\Ninject.dll - - ..\packages\Ninject.MockingKernel.3.0.0.5\lib\net35-full\Ninject.MockingKernel.dll - False lib\PdfSharp.dll diff --git a/NAPS2/ProfileManager.cs b/NAPS2/ProfileManager.cs index c76997a014..6891d60b9f 100644 --- a/NAPS2/ProfileManager.cs +++ b/NAPS2/ProfileManager.cs @@ -30,7 +30,11 @@ namespace NAPS2 public class ProfileManager : IProfileManager { private const string ProfilesFileName = "profiles.xml"; +#if STANDALONE + private static readonly string ProfilesFolder = Application.StartupPath; +#else private static readonly string ProfilesFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "NAPS2"); +#endif private static readonly string ProfilesPath = Path.Combine(ProfilesFolder, ProfilesFileName); private static readonly string OldProfilesPath = Path.Combine(Application.StartupPath, "profiles.xml"); diff --git a/NAPS2/Setup/build-standalone.bat b/NAPS2/Setup/build-standalone.bat new file mode 100644 index 0000000000..b8ad5cc1a8 --- /dev/null +++ b/NAPS2/Setup/build-standalone.bat @@ -0,0 +1,15 @@ +@echo off +set VERSION=1.0b1 +set OUTFOLDER=..\publish\naps2-%VERSION%-standalone +set OUTFILE=..\publish\naps2-%VERSION%-standalone.zip +set BINFOLDER=..\bin\Standalone +mkdir %OUTFOLDER% +copy %BINFOLDER%\NAPS2.exe %OUTFOLDER% +copy %BINFOLDER%\PdfSharp.dll %OUTFOLDER% +copy %BINFOLDER%\Interop.WIA.dll %OUTFOLDER% +copy %BINFOLDER%\Ninject.dll %OUTFOLDER% +copy ..\Resources\scanner-app.ico %OUTFOLDER% +copy lib\wiaaut.dll %OUTFOLDER% +del %OUTFILE% +7z a %OUTFILE% %OUTFOLDER%\* +rmdir /S /Q %OUTFOLDER% \ No newline at end of file diff --git a/NAPS2/Setup/setup.iss b/NAPS2/Setup/setup.iss index 592122ea19..e073361ce4 100644 --- a/NAPS2/Setup/setup.iss +++ b/NAPS2/Setup/setup.iss @@ -13,7 +13,7 @@ AppUpdatesURL=http://www.sourceforge.net/projects/naps2 DefaultDirName={pf}\NAPS2 DefaultGroupName=NAPS2 OutputDir=../publish -OutputBaseFilename=naps2-setup-{#AppVersion} +OutputBaseFilename=naps2-{#AppVersion}-setup Compression=lzma SolidCompression=yes