From 5ca135f3f6a8497d055a14b90260f93bba64b39a Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sat, 28 Aug 2010 19:56:19 +0100 Subject: [PATCH] [repo] Add an error state icon and [repo] don't commit empty change sets --- SparkleLib/SparkleRepo.cs | 18 +- SparkleShare/SparkleStatusIcon.cs | 35 +- SparkleShare/SparkleUI.cs | 6 +- data/icons/Makefile.am | 1 + data/icons/sparkleshare-syncing-error-24.png | Bin 0 -> 1269 bytes data/sparkleshare-gnome.svg | 5225 ++++++++++-------- 6 files changed, 2954 insertions(+), 2331 deletions(-) create mode 100644 data/icons/sparkleshare-syncing-error-24.png diff --git a/SparkleLib/SparkleRepo.cs b/SparkleLib/SparkleRepo.cs index 9d309732..5b14bda6 100644 --- a/SparkleLib/SparkleRepo.cs +++ b/SparkleLib/SparkleRepo.cs @@ -56,6 +56,7 @@ namespace SparkleLib { public delegate void NewCommitEventHandler (object o, NewCommitArgs args); public delegate void ConflictDetectedEventHandler (object o, SparkleEventArgs args); public delegate void ChangesDetectedEventHandler (object o, SparkleEventArgs args); + public delegate void CommitEndedUpEmptyEventHandler (object o, SparkleEventArgs args); public event AddedEventHandler Added; public event CommitedEventHandler Commited; @@ -67,6 +68,7 @@ namespace SparkleLib { public event NewCommitEventHandler NewCommit; public event ConflictDetectedEventHandler ConflictDetected; public event ChangesDetectedEventHandler ChangesDetected; + public event CommitEndedUpEmptyEventHandler CommitEndedUpEmpty; public SparkleRepo (string path) @@ -198,9 +200,12 @@ namespace SparkleLib { TimeSpan changed = new TimeSpan (now.Ticks - LastChange.Ticks); if (changed.TotalMilliseconds > 5000) { - HasChanged = false; + SparkleHelpers.DebugInfo ("Local", "[" + Name + "] Changes have settled, adding files..."); + + HasChanged = false; AddCommitAndPush (); + } } @@ -223,7 +228,7 @@ namespace SparkleLib { if (!HasChanged) { SparkleEventArgs args = new SparkleEventArgs ("ChangesDetected"); -Console.WriteLine ("test"); + if (ChangesDetected != null) ChangesDetected (this, args); @@ -245,7 +250,7 @@ Console.WriteLine ("test"); } - // When there are changes we generally want to Add, Commit and Push + // When there are changes we generally want to Add, Commit and Push, // so this method does them all with appropriate timers, etc. switched off public void AddCommitAndPush () { @@ -265,6 +270,13 @@ Console.WriteLine ("test"); CheckForRemoteChanges (); Push (); + } else { + + SparkleEventArgs args = new SparkleEventArgs ("CommitEndedUpEmpty"); + + if (CommitEndedUpEmpty != null) + CommitEndedUpEmpty (this, args); + } } finally { diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs index 7459455d..812b6d2e 100644 --- a/SparkleShare/SparkleStatusIcon.cs +++ b/SparkleShare/SparkleStatusIcon.cs @@ -329,6 +329,14 @@ namespace SparkleShare { public void ShowState () + { + + ShowState (false); + + } + + + public void ShowState (bool error) { UpdateFolderSize (); @@ -339,10 +347,18 @@ namespace SparkleShare { if (SyncingReposCount > SparkleUI.Repositories.Count) SyncingReposCount = SparkleUI.Repositories.Count; - if (SyncingReposCount > 0) - SetSyncingState (); - else - SetIdleState (); + if (error) { + + SetErrorState (); + + } else { + + if (SyncingReposCount > 0) + SetSyncingState (); + else + SetIdleState (); + + } UpdateStatusMenuItem (); @@ -374,15 +390,12 @@ namespace SparkleShare { // Changes the state to indicate there was an error syncing - public void ShowErrorState () + public void SetErrorState () { - Pixbuf = SparkleHelpers.GetIcon ("image-missing", 24); - StateText = _("Failed to sync your changes"); - - UpdateStatusMenuItem (); - - SparkleHelpers.DebugInfo ("Status", "Number of repos syncing: " + SyncingReposCount); + Timer.Stop (); + Application.Invoke (delegate { Pixbuf = SparkleHelpers.GetIcon ("sparkleshare-syncing-error", 24); }); + StateText = _("Failed to sync changes"); } diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs index 60230d7c..36b79ed6 100644 --- a/SparkleShare/SparkleUI.cs +++ b/SparkleShare/SparkleUI.cs @@ -359,7 +359,7 @@ namespace SparkleShare { { NotificationIcon.SyncingReposCount--; - NotificationIcon.ShowErrorState (); + NotificationIcon.ShowState (true); } @@ -410,6 +410,10 @@ namespace SparkleShare { Application.Invoke (UpdateStatusIconToIdle); }; + repo.CommitEndedUpEmpty += delegate { + Application.Invoke (UpdateStatusIconToIdle); + }; + repo.PushingFailed += delegate { Application.Invoke (UpdateStatusIconToError); }; diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index b1b689c4..7618c2ad 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -19,6 +19,7 @@ app_theme_icons = \ places,folder-sparkleshare-256.png \ places,folder-sparkleshare-32.png \ places,folder-sparkleshare-48.png \ + status,sparkleshare-syncing-error-24.png \ status,avatar-default-16.png \ status,avatar-default-22.png \ status,avatar-default-24.png \ diff --git a/data/icons/sparkleshare-syncing-error-24.png b/data/icons/sparkleshare-syncing-error-24.png new file mode 100644 index 0000000000000000000000000000000000000000..2f854e6c987b03cdd1f25baf2dc228d9ef48b6b8 GIT binary patch literal 1269 zcmV=0000ZbVXQnL3MO! zZ*l-gd2DNCAVP0$b1WcCVQ_CCLt$)TZDDR?a%E{Vcked<001v^MObu1WpiV4X>fFD zZ*BlYWpZhDWn>^`a&K)QN?~htVjxp=Wod3@awl^jWMy+{XKsG9B_jX;08(^CSad^g zaCvfRXJ~W)Lqi}zbaZlQVs&(BZ*DD9Xkl_?L2PMjWguvDbZ|N^FJp3LVRUJBWn*t` zZEtRKE^l&YFKlUJWo~n2b1!0fEpuTnGcGVMUV~b^000AwNklXBl}g;y5OXBH}nEj$@>h zY;SKj<2Zh0ZEfwBf2AOf~AS0>+9>oJqq&q{1ITduA3;w zFbrm9X0UCW-Q8Vm+ooErp7p+i+1c6T{Vp2{3kwUFrkSWrYmMVL?CFlN5B4bz@>;f>bJn z)|z^~PP5shP$)1pHH8p@dc97g(Ma5RDgxj4F${xBrGnNP%d*(p+rzeP#>dAAf*^56 z2$4|L*+r*8!!Q!(@bD1d_dAX5@9$@Lc$jR?=JBt){MmE~BfoRXmB+mJ(iLvqzWH&F z0wF|?f^0TR6h(w#$iTn=nM{V`<757)*0_50Wh^TLXp~ZfDkKa;{HD*Ny+)e?B6eHd$R=1>nZ=n|$@<*8nUp-#|)fBot_^n^MY*Wm!Z~ zgbx~@w)ou7} z2L}f)^fciKc>eMwRM%3x_Szy3zW)I@naH*RA=(6K;1Y19{k#xwzw_3e#l=@s-K!;z zHE|TtY_)j!(?j+7XJ4cZt+f_Hgg_NIZWCUJAn - - - - - - - - - - - - + + + + + + + + + + + + + spacingx="0.5px" + empspacing="2" + enabled="false" + visible="true" + id="grid8407" + type="xygrid" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> @@ -201,1075 +201,1016 @@ + + style="stop-color:#a04600;stop-opacity:1" /> + style="stop-color:#ce5c00;stop-opacity:1" /> + id="linearGradient4775" + inkscape:collect="always"> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:#a1a184;stop-opacity:1;" /> + id="stop11583" /> + style="stop-color:#000000;stop-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + id="stop3425" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="stop4351-6" /> + x="-0.012418499" + width="1.024837" + y="-0.35608697" + height="1.7121739" + color-interpolation-filters="sRGB"> + id="feGaussianBlur4377-0" /> + id="stop4349-3-4" /> + style="stop-color:#ffffff;stop-opacity:0.49803922;" /> + id="stop4351-6-4" /> + x="-0.012418499" + width="1.024837" + y="-0.35608697" + height="1.7121739" + color-interpolation-filters="sRGB"> + id="feGaussianBlur4377-0-0" /> + id="pattern4229-8" + patternTransform="translate(-523,-583)" /> + height="256" + patternTransform="translate(-523,-333)" + id="pattern2719-8"> + height="256" + id="image2715-4" + x="0" + y="0" /> + id="stop4103-5" /> + style="stop-color:#ffffff;stop-opacity:0.80588233;" /> + id="stop4105-2" /> + inkscape:collect="always" + id="linearGradient4347-2"> + id="stop4349-8" /> + id="stop4351-61" /> + x="-0.012418499" + width="1.024837" + y="-0.35608697" + height="1.7121739" + color-interpolation-filters="sRGB"> + id="feGaussianBlur4377-5" /> + color-interpolation-filters="sRGB"> + id="feGaussianBlur4381-6" /> + style="stop-color:#ffffff;stop-opacity:1;" /> + id="stop4328-6" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:#ffffff;stop-opacity:1;" /> + id="stop4318-1" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + id="clipPath10943" + clipPathUnits="userSpaceOnUse"> + d="m 122.25371,334.00973 128.40625,0 c 3.19684,0 5.34037,2.0241 5.34375,5.0625 l 0.125,121.71875 c 0,16.5 -3.66218,25.21875 -10.46875,25.21875 l -197.25,0 c -6.60581,0.59601 -7.36487,-12.58994 -7.5,-27.21875 l -0.90625,-99.46875 c -0.01871,-2.02557 2.11566,-5.0625 5.3125,-5.0625 l 52.28125,-0.0313 c 4.16844,-0.002 7.55716,-1.94026 9.46875,-4.78125 l 7.65625,-11.34375 c 1.61572,-2.40127 4.33318,-4.09375 7.53125,-4.09375 l 0,5e-5 z" + style="fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.29999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" /> + inkscape:collect="always"> + inkscape:collect="always" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="matrix(0.3088951,0,0,0.2737476,302.93885,177.47817)" + gradientUnits="userSpaceOnUse" + id="linearGradient10672" + xlink:href="#linearGradient4908" + inkscape:collect="always" /> + inkscape:collect="always" /> + fx="306.10458" + cy="179.00713" + cx="306.10458" + gradientTransform="matrix(2.5489229,0,0,0.5173029,-475.40932,88.050179)" + gradientUnits="userSpaceOnUse" + id="radialGradient10676" + xlink:href="#linearGradient4613" + inkscape:collect="always" /> + inkscape:collect="always" /> - + inkscape:collect="always" /> - - - - - - + id="radialGradient10682" + xlink:href="#linearGradient4347-6" + inkscape:collect="always" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + xlink:href="#linearGradient4908" + inkscape:collect="always" /> + xlink:href="#linearGradient11481" + inkscape:collect="always" /> + xlink:href="#linearGradient4613" + inkscape:collect="always" /> + xlink:href="#linearGradient4347-6" + inkscape:collect="always" /> + xlink:href="#linearGradient4908" + inkscape:collect="always" /> + xlink:href="#linearGradient11481" + inkscape:collect="always" /> + xlink:href="#linearGradient4613" + inkscape:collect="always" /> + xlink:href="#linearGradient4347-6" + inkscape:collect="always" /> + xlink:href="#linearGradient4908" + inkscape:collect="always" /> + xlink:href="#linearGradient11481" + inkscape:collect="always" /> + xlink:href="#linearGradient4613" + inkscape:collect="always" /> - - - - + inkscape:collect="always" /> - + - + + fx="306.10458" + cy="179.00713" + cx="306.10458" + gradientTransform="matrix(2.5489229,0,0,0.5173029,-475.40932,88.050179)" + gradientUnits="userSpaceOnUse" + id="radialGradient3507" + xlink:href="#linearGradient4613" + inkscape:collect="always" /> + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient4775-1" + inkscape:collect="always" /> - - - + inkscape:collect="always" /> + y1="195" + x1="306.25" + gradientTransform="translate(53,-160)" + gradientUnits="userSpaceOnUse" + id="linearGradient3630" + xlink:href="#linearGradient11481-2" + inkscape:collect="always" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + y1="184.76149" + x1="311.83408" + gradientUnits="userSpaceOnUse" + id="linearGradient22418-492" + xlink:href="#linearGradient4775-482" + inkscape:collect="always" /> + + + + + + + inkscape:label="artwork:sparkleshare" + id="layer17" + inkscape:groupmode="layer"> + id="layer20" + inkscape:groupmode="layer"> + style="display:inline;enable-background:new"> + id="path10372" + sodipodi:nodetypes="ccccccccccccccc" /> + id="path10374" + sodipodi:nodetypes="cccccccccsssccccccc" /> + d="m 309.78125,222.5 c -0.2554,0 -0.45965,0.13987 -0.59375,0.34375 -0.43264,0.54853 -1.12354,1.65625 -1.65625,1.65625 l -2.6875,0 c -0.83807,0 -1.34374,0.5428 -1.34375,1.46875 l 0,6.125 c 0,1.33756 0.65057,2.40625 1.46875,2.40625 l 12.0625,0 c 0.81819,0 1.46875,-1.06869 1.46875,-2.40625 l 0,-8.90625 c 0,-0.37505 -0.29595,-0.6875 -0.65625,-0.6875 l -8.0625,0 z" + style="fill:url(#linearGradient11729);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient11731);stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" /> + d="m 310.9375,183.5 c -0.74659,0.74659 -1.60864,2 -2.40625,2 l -2.6875,0 c -0.20314,0 -0.22418,0.0344 -0.25,0.0625 -0.0258,0.0281 -0.0937,0.12531 -0.0937,0.40625 l 0,7.53125 13,0 0,-10 -7.5625,0 -5e-5,0 z" + style="opacity:0.40639271;fill:none;stroke:url(#linearGradient11733);stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" + transform="translate(-1,40)" /> + id="path10381" + d="m 250.0625,476.75 c -0.0458,1.33554 -0.49131,2.35705 -1.21875,3.0625 -0.72744,0.70545 -1.76871,1.125 -3.1875,1.125 l -197.25,0 c -1.418904,0 -2.480488,-0.44927 -3.21875,-1.15625 -0.738262,-0.70698 -1.186879,-1.70494 -1.21875,-3.03125 l 0,3 c 0.03187,1.32631 0.480488,2.32427 1.21875,3.03125 0.738262,0.70698 1.799846,1.15625 3.21875,1.15625 l 197.25,0 c 1.41879,0 2.46006,-0.41955 3.1875,-1.125 0.72744,-0.70545 1.17291,-1.72696 1.21875,-3.0625 l 0,-3 z" + style="opacity:0.71595327;fill:url(#radialGradient11735);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4375-3-0);enable-background:new" /> + transform="matrix(1.0414202,0,0,0.9247512,11.22481,-241.96829)"> - + + width="230" + height="20" + x="15" + y="201" + rx="8.1534395" + ry="10" + transform="matrix(0.1836956,0,0,0.157768,296.61958,56.633265)" /> + style="display:inline;enable-background:new"> + id="g10391" + style="display:inline;enable-background:new"> + style="fill:url(#linearGradient11598);fill-opacity:1;fill-rule:evenodd;stroke:none" + d="M 52.094352,312 C 49.758741,312 48,313.27843 48,315.94967 l 0,167.46562 C 48,487.36726 50.446761,490 53.771787,490 L 243.327,490 c 3.34438,0 4.673,-2.46074 4.673,-5.90535 l 0,-147.52177 c 0,-2.95096 -2.01067,-4.54661 -4.51602,-4.54661 l -93.98741,0 c -1.69284,0 -4.43377,-0.2055 -6.49302,-2.5614 l -13.0712,-14.95423 c -1.75748,-2.01066 -4.22518,-2.51056 -6.08975,-2.51056 L 52.094352,312 z" /> + style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4123);enable-background:new" /> + d="M 52.09375,313 C 49.758138,313 48,314.26626 48,316.9375 l 0,2 C 48,316.26626 49.758138,315 52.09375,315 l 70.75,0 c 1.86457,0 4.33628,0.48933 6.09375,2.5 L 142,332.46875 c 2.05925,2.3559 4.80716,2.56249 6.5,2.5625 l 94.96875,0 c 2.50535,0 4.53125,1.58029 4.53125,4.53125 l 0,-2 c 0,-2.95096 -2.0259,-4.53125 -4.53125,-4.53125 l -94.96875,0 c -1.69284,-10e-6 -4.44075,-0.2066 -6.5,-2.5625 L 128.9375,315.5 c -1.75747,-2.01067 -4.22918,-2.5 -6.09375,-2.5 l -70.75,0 0,0 0,0 z" + style="opacity:0.53881279;fill:url(#radialGradient11600);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" /> - - - - - - - - - - + width="1.75" + height="52.75" + x="49.25" + y="57" + rx="0.875" + ry="0.875" + transform="matrix(0.7734591,0,0,1,10.90714,260)" /> + inkscape:radius="-1.03125" + inkscape:original="M 300.34375 52.5 C 299.86497 52.499999 299.5 52.753456 299.5 53.3125 L 299.5 88.375 C 299.5 89.202084 300.00587 89.75 300.6875 89.75 L 339.53125 89.75 C 340.21684 89.750004 340.5 89.252149 340.5 88.53125 L 340.5 57.40625 C 340.50001 56.788666 340.0761 56.46875 339.5625 56.46875 L 320.3125 56.46875 C 319.96548 56.468751 319.40853 56.414881 318.96875 55.9375 L 316.28125 53.03125 C 315.90591 52.62383 315.44474 52.5 315.0625 52.5 L 300.34375 52.5 z " + style="opacity:0.1;fill:none;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;display:inline;enable-background:new" + id="path10402" + d="m 300.53125,53.53125 0,34.84375 c 0,0.203294 0.0697,0.285216 0.0937,0.3125 0.024,0.02728 -0.002,0.03125 0.0625,0.03125 l 38.75,0 c 0.009,-0.02998 0.0312,-0.0363 0.0312,-0.1875 l 0,-31.03125 -19.15625,0 c -0.45375,10e-7 -1.38619,-0.106948 -2.09375,-0.875 l -2.6875,-2.90625 c -0.16068,-0.174415 -0.30923,-0.1875 -0.46875,-0.1875 l -14.53125,0 z" + transform="translate(-1.7e-5,1.000001)" /> + sodipodi:nodetypes="cccccccccsscc" + id="path10404" + style="fill:none;stroke:url(#linearGradient11604);stroke-width:1;display:inline;enable-background:new" + d="m 300.33932,53.5 c -0.4788,0 -0.83934,0.267554 -0.83934,0.826598 l 0,34.047697 c 0,0.82708 0.50158,1.378067 1.18321,1.378067 l 38.85883,0 c 0.6856,0 0.95797,-0.51499 0.95797,-1.235889 l 0,-30.09476 c 0,-0.617585 -0.41219,-0.951527 -0.92579,-0.951527 l -19.26742,0 c -0.34703,0 -0.89129,-0.05868 -1.33107,-0.536058 l -2.6796,-2.908694 c -0.37533,-0.40742 -0.86615,-0.525417 -1.24839,-0.525417 L 300.33932,53.5 z" /> + transform="matrix(0.9558116,0,0,0.96875,39.13997,-247.125)" + id="g10406" + style="display:inline;enable-background:new"> - - - - - - - - - - - - - - - - - - - - - - - + id="path10410" + d="m 42.874334,352.72477 52.26746,-0.0193 c 4.168441,-0.002 7.220916,-2.2103 9.481656,-4.78283 l 11.31178,-12.87182 c 1.91084,-2.17436 4.3437,-4.11535 7.54177,-4.11535 l 128.41869,0 c 3.19684,0 5.30677,2.02582 5.32808,5.06425 l 0.95575,136.27379 c 0.0219,3.12528 -2.16724,15.87165 -10.68719,15.87165 l -200.933269,0 c -3.28819,0 -8.727261,-8.8895 -8.734608,-12.01492 L 37.546254,357.78902 c -0.0048,-2.02573 2.13123,-5.06425 5.32808,-5.06425 z" + style="fill:url(#linearGradient11558);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible" + clip-path="none" /> + sodipodi:nodetypes="ccccccccccccccccc" + id="path10412" + d="m 123.25,335 c -3.19807,0 -5.91553,1.72373 -7.53125,4.125 l -7.65625,11.34375 c -1.91159,2.84099 -5.30031,4.7797 -9.46875,4.78125 l -53.25,0 c -3.196847,0 -5.39241,2.03742 -5.34375,4.0625 l 0.03125,1.65625 c 0.181474,-2.00765 2.290875,-3.71875 5.3125,-3.71875 l 53.25,0 c 4.16844,-0.002 7.55716,-1.94026 9.46875,-4.78125 L 115.71875,341.125 C 117.33447,338.72373 120.05193,337 123.25,337 l 127.40625,0 c 2.87974,10e-6 5.0005,1.64142 5.3125,4.1875 L 256,340.0625 c 0.10424,-3.03661 -2.14692,-5.06249 -5.34375,-5.0625 L 123.25,335 z" + style="fill:url(#radialGradient11560);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" /> + + - - + inkscape:href="#path9590" + d="m 314.625,61.5625 c -0.27285,0 -0.50707,0.158006 -0.71875,0.4375 l -1.59375,2.09375 c -0.60305,0.796162 -1.61151,1.374564 -2.8125,1.375 l -10.875,0 c -0.004,0 0.002,-0.0034 -0.0312,0.03125 -0.0333,0.03464 -0.0317,0.123018 -0.0312,-0.0625 l -0.0312,5.3125 c -0.0122,3.836667 -0.0453,9.007017 0.15625,13.1875 0.1008,2.090242 0.25866,3.940133 0.5,5.1875 0.11807,0.610227 0.26774,1.086687 0.375,1.3125 l 40.875,0 c 0.0692,-0.120363 0.17803,-0.372313 0.28125,-0.78125 0.22371,-0.886297 0.38957,-2.317828 0.5,-4.09375 0.22087,-3.551845 0.22025,-8.514723 0.21875,-13.96875 l 0,-10.03125 c -0.003,-0.0017 0.0133,0 -0.0625,0 l -26.75,0 z" + id="path10418" + style="opacity:0.82101165;fill:none;stroke:url(#radialGradient11564);stroke-width:1.03922105;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" + xlink:href="#path9590" + inkscape:original="M 314.625 60.5 C 313.95873 60.5 313.4218 60.869352 313.0625 61.34375 L 311.46875 63.4375 C 311.04365 63.998727 310.36842 64.405935 309.5 64.40625 L 298.625 64.40625 C 297.95899 64.40625 297.501 65.024372 297.5 65.4375 L 297.46875 70.75 C 297.44435 78.41335 297.29487 91.499996 299.25 91.5 L 340.6875 91.5 C 342.51804 91.5 342.503 82.500987 342.5 71.59375 L 342.5 61.53125 C 342.49982 60.911558 342.041 60.5 341.375 60.5 L 314.625 60.5 z " + inkscape:radius="-1.0645162" + sodipodi:type="inkscape:offset" /> - - - - - - - + sodipodi:nodetypes="czzszczzcczzcc" + id="path10420" + d="m 298.61018,64.417305 10.88905,-0.0039 c 0.86843,-3.14e-4 1.55025,-0.414219 1.97535,-0.975446 l 1.58957,-2.098608 C 313.42345,60.864954 313.96909,60.5 314.63536,60.5 l 26.75388,0 c 0.66601,0 1.10984,0.41315 1.11002,1.032842 l 0.003,10.065117 c 0.003,10.907239 0.0259,19.902045 -1.80464,19.902045 l -41.4476,0 c -1.95512,0 -1.79114,-13.079445 -1.76674,-20.742795 l 0.0169,-5.307065 c 10e-4,-0.41313 0.44401,-1.032839 1.11002,-1.032839 l -2e-5,0 0,0 0,0 z" + style="fill:none;stroke:url(#linearGradient11566);stroke-width:1.03922105;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + transform="matrix(0.706897,0,0,0.5961355,542.31854,400.81413)" + style="opacity:0.7;display:inline;enable-background:new" + id="g10422"> + transform="matrix(0.1836956,0,0,0.157768,296.61958,56.633265)" + ry="10" + rx="8.1534395" + y="201" + x="15" + height="20" + width="230" + id="rect10424" + style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter4496)" /> + - + id="g10428" + transform="translate(450,300)"> + + + + + + + d="m 306.5,131.5 0,22 25,0 0,-19.96875 -12.3125,0 c -0.48404,-2e-5 -0.98403,-0.19311 -1.46875,-0.5625 l -1.75,-1.34375 C 315.77961,131.48088 315.67019,131.5 315.75,131.5 l -9.25,0 z" + id="path10440" + style="opacity:0.1;fill:none;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;display:inline;enable-background:new" + inkscape:original="M 306.0625 130.5 C 305.74722 130.5 305.5 130.67087 305.5 131.03125 L 305.5 153.625 C 305.50001 154.15817 305.83236 154.5 306.28125 154.5 L 331.875 154.5 C 332.32648 154.49999 332.5 154.18347 332.5 153.71875 L 332.5 133.15625 C 332.49999 132.75812 332.21322 132.53125 331.875 132.53125 L 319.1875 132.53125 C 318.95896 132.53124 318.64861 132.44364 318.3125 132.1875 L 316.5625 130.84375 C 316.27564 130.62517 316.00171 130.5 315.75 130.5 L 306.0625 130.5 z " + inkscape:radius="-1" + sodipodi:type="inkscape:offset" /> + + + + + + + + + + + + - - - - - - + sodipodi:type="inkscape:offset" + inkscape:radius="-1" + inkscape:original="M 315.53125 135.5 C 315.10188 135.5 314.80988 135.75403 314.53125 136 L 313.5 136.90625 C 313.17033 137.19727 312.77839 137.53106 312.21875 137.53125 L 305.21875 137.53125 C 304.78955 137.53125 304.50025 137.90305 304.5 138.15625 L 304.5 152.03125 C 304.49795 154.01574 305.18352 154.49999 305.625 154.5 L 332.125 154.5 C 332.56647 154.5 333.49841 154.0258 333.5 152 L 333.5 136.125 C 333.50029 135.74516 333.21046 135.5 332.78125 135.5 L 315.53125 135.5 z " + style="opacity:0.3;fill:none;stroke:url(#linearGradient11679);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" + id="path10462" + d="m 315.53125,136.5 c -0.0349,0 -0.0689,0.007 -0.34375,0.25 l -1.03125,0.90625 c -0.34006,0.3002 -0.98039,0.87468 -1.9375,0.875 l -6.71875,0 0,13.5 c -9.1e-4,0.87701 0.16607,1.33186 0.25,1.46875 l 26.375,0 c -0.27462,0 0.37365,0.21923 0.375,-1.5 l 0,-15.5 -16.96875,0 z" /> - + style="opacity:0.9;display:inline;enable-background:new" + id="g10348" + transform="matrix(0.4665583,0,0,0.7923004,188.99015,-124.99549)"> + sodipodi:nodetypes="ccsccsc" + id="path10352" + d="m 42.556256,201 186.555464,0 C 237.91383,201 245,205.46 245,211 c 0,5.54 -7.08617,10 -15.88828,10 l -186.555464,0 c -8.80211,0 -15.888285,-4.46 -15.888285,-10 0,-5.54 7.086175,-10 15.888285,-10 l 0,0 z" + style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter4496)" + transform="matrix(0.1836956,0,0,0.157768,296.61958,56.633265)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="display:inline" + inkscape:label="hires" + id="layer21" + inkscape:groupmode="layer"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="opacity:0.45783099;fill:url(#radialGradient4143);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" /> + sodipodi:cx="239" + sodipodi:cy="51" + sodipodi:rx="5" + sodipodi:ry="5" + d="m 244,51 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z" /> + style="opacity:0.45783099;fill:url(#radialGradient7892-7);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" /> + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + id="path14851-8" + sodipodi:cx="239" + sodipodi:cy="51" + sodipodi:rx="5" + sodipodi:ry="5" + d="m 244,51 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z" /> + id="path14984-6" + sodipodi:sides="5" + sodipodi:cx="157.25" + sodipodi:cy="187.61218" + sodipodi:r1="57.682449" + sodipodi:r2="23.586105" + sodipodi:arg1="0.5417155" + sodipodi:arg2="1.1714918" + inkscape:flatsided="false" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 206.67379,217.35364 -40.25404,-8.01083 -22.18276,34.4648 -4.82043,-40.75934 -39.632833,-10.44685 37.274853,-17.17984 -2.31168,-40.92131 27.85756,30.14162 38.20413,-14.84391 -20.05793,35.80838 25.92313,31.74728 z" + inkscape:transform-center-x="0.042578782" + inkscape:transform-center-y="-4.4264044" + transform="matrix(0.795516,0.351305,-0.351384,0.795695,88.379148,-256.9333)" /> - - + + + transform="translate(307.13515,-213.3706)" + id="g12056-1"> + style="opacity:0.45783099;fill:url(#radialGradient12066-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" /> + sodipodi:cx="239" + sodipodi:cy="51" + sodipodi:rx="5" + sodipodi:ry="5" + d="m 244,51 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z" /> + style="opacity:0.45783099;fill:url(#radialGradient12068-3);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" /> + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + id="path12064-0" + sodipodi:cx="239" + sodipodi:cy="51" + sodipodi:rx="5" + sodipodi:ry="5" + d="m 244,51 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z" /> + transform="translate(81,-71)" + id="g3695" />