Changeset 2673 for lliurex-up


Ignore:
Timestamp:
Oct 25, 2016, 2:16:49 PM (3 years ago)
Author:
jrpelegrina
Message:

WIP in GUI

Location:
lliurex-up/trunk/fuentes/lliurex-up-gui
Files:
7 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • lliurex-up/trunk/fuentes/lliurex-up-gui/lliurex-up

    r2669 r2673  
    1616import time
    1717
    18 from gi.repository import Gtk, Gdk, GObject, GLib, PangoCairo, Pango, Vte
     18from gi.repository import Gtk, Gdk, GdkPixbuf, GObject, GLib, PangoCairo, Pango, Vte
    1919
    2020import signal
     
    2828
    2929RSRC_DIR="rsrc/"
     30CACHED_ICON="rsrc/cached.png"
     31DONE_ICON="rsrc/done.png"
     32ERROR_ICON="rsrc/error.png"
    3033
    3134class Package:
     
    3841                self.parse_desktop(desktop_file)
    3942                self.parse_changelog(changelog_file)
    40 
     43                self.parse_installed(CACHED_ICON)
    4144
    4245        def parse_desktop(self,desktop_file):
     
    6972                        self.changelog="Changelog not found"
    7073
     74        def parse_installed(self, icon_file):
     75                        image=Gtk.Image()
     76                        image.set_from_file(icon_file)         
     77                        self.installed=image.get_pixbuf()
    7178
    7279
     
    93100                self.main_box=builder.get_object("main_box")
    94101                self.pbar=builder.get_object("progressbar")
    95                 #self.pbar_label=builder.get_object("pbar_label")
     102                self.pbar_label=builder.get_object("progressbar_label")
    96103               
    97104
     
    147154                self.changelog_texview=builder.get_object("changelog_textview")
    148155
    149                 self.packages_store=Gtk.ListStore(str,str,str)
     156                self.packages_store=Gtk.ListStore(str,str,str,GdkPixbuf.Pixbuf)
    150157                self.packages_tv.set_model(self.packages_store)
    151158                column=Gtk.TreeViewColumn("")
     
    173180                column.add_attribute(cell,"markup",2)
    174181                self.packages_tv.append_column(column)         
     182
     183
     184                done_icon=Gtk.Image()
     185                done_icon.set_from_file(CACHED_ICON)
     186                pixbuf=done_icon.get_pixbuf()
     187                column=Gtk.TreeViewColumn("Installed")
     188                cell=Gtk.CellRendererPixbuf()
     189                #cell.set_property("stock-size",Gtk.IconSize.DIALOG)
     190                column.pack_start(cell,True)
     191                column.add_attribute(cell,"pixbuf",3)
     192                self.packages_tv.append_column(column)
    175193               
    176194                self.changelog_textview=builder.get_object("changelog_textview")
     
    192210                self.no_button_box.hide()
    193211
    194                 #self.pbar_label.hide()
     212                self.pbar_label.show()
    195213                self.pbar.show()
    196214               
     
    199217               
    200218                self.set_css_info()
    201                 #self.get_update_info()
     219               
    202220
    203221
     
    292310                Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(),self.style_provider,Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
    293311               
    294                 self.update_box.set_name("WHITE_BACKGROUN")
    295                 self.gather_logo_box.set_name("GATHER_ICON_COLOR")
    296                 self.gather_label.set_name("BLUE_FONT")
     312                self.window.set_name("WHITE_BACKGROUND")
     313                self.update_box.set_name("WHITE_BACKGROUND")
     314                self.gather_box.set_name("WHITE_BACKGROUND")
     315                self.packages_box.set_name("WHITE_BACKGROUND")
     316                self.gather_label.set_name("CHANGELOG_FONT")
     317                self.pbar_label.set_name("CHANGELOG_FONT")
    297318
    298319                self.yes_button_box.set_name("BUTTON_COLOR")
     
    383404                        self.get_update_info()
    384405                        self.pbar.hide()
    385                         self.stack.set_transition_type(Gtk.StackTransitionType.SLIDE_LEFT)
    386                         self.stack.set_visible_child_name("update")     
     406                        self.pbar_label.hide()
     407                        if len(self.package_list)==0:
     408                                msg_gather="<span><b>"+_("Your system is update")+"</b></span>"
     409                                self.gather_label.set_markup(msg_gather)
     410
     411                        else:
     412                               
     413                                self.stack.set_transition_type(Gtk.StackTransitionType.SLIDE_LEFT)
     414                                self.stack.set_visible_child_name("update")     
     415                       
    387416                        self.cancel_button_box.show()
    388417
     
    394423                for package in self.package_list:
    395424                        print package
    396                         self.packages_store.append((package.icon,"<span font='Roboto'><b>"+package.name+"</b></span>\n"+"<span font='Roboto' size='small'>"+package.version+"</span>","<span font='Roboto' size='large'><b>"+package.size+"</b></span>"))
     425                        self.packages_store.append((package.icon,"<span font='Roboto'><b>"+package.name+"</b></span>\n"+"<span font='Roboto' size='small'>"+package.version+"</span>","<span font='Roboto' size='large'><b>"+package.size+"</b></span>",package.installed))
    397426                       
    398427                       
     
    447476                )
    448477
     478                self.update_status()
    449479                               
    450480        def install_packages(self,widget, event=None):
     
    454484                GLib.timeout_add(100,self.pulsate_pbar)
    455485                self.pbar.show()
     486                self.pbar_label.show()
    456487                self.viewport.show()
    457488                self.terminal_scrolled.show()
     
    459490                msg_terminal=_("Update process details")
    460491                self.terminal_label.set_markup(msg_terminal)
    461                                
    462492       
     493
     494
    463495        def get_update_info(self):
    464496                self.version_available="16.160916"
     
    500532       
    501533
     534        def update_status(self):
     535                image=Gtk.Image()
     536                image.set_from_file(ERROR_ICON)         
     537                icon=image.get_pixbuf()
     538
     539                for item in self.packages_store:
     540                        item[3]=icon
     541
    502542        def quit(self,widget,event=None):
    503543               
  • lliurex-up/trunk/fuentes/lliurex-up-gui/rsrc/lliurex-up.svg

    r2641 r2673  
    1616   width="600"
    1717   height="70"
    18    sodipodi:docname="lliurex-up2.svg"
    19    inkscape:export-filename="/home/hector/Desktop/pointer.png"
     18   sodipodi:docname="lliurex-up.svg"
     19   inkscape:export-filename="/home/lliurex/svn/lliurex-up/trunk/fuentes/lliurex-up-gui/rsrc/lliurex-up-banner.png"
    2020   inkscape:export-xdpi="90"
    2121   inkscape:export-ydpi="90">
     
    2828        <dc:type
    2929           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
    30         <dc:title></dc:title>
     30        <dc:title />
    3131      </cc:Work>
    3232    </rdf:RDF>
     
    29342934         id="feGaussianBlur6229" />
    29352935    </filter>
    2936     <radialGradient
    2937        r="5.1217437"
    2938        fy="1037.371"
    2939        fx="12.374369"
    2940        cy="1037.371"
    2941        cx="12.374369"
    2942        gradientTransform="matrix(0.55224242,0.81109759,-1.0030638,0.68294295,1046.09,318.39224)"
    2943        gradientUnits="userSpaceOnUse"
    2944        id="radialGradient4181"
    2945        xlink:href="#linearGradient4169"
    2946        inkscape:collect="always" />
    2947     <linearGradient
    2948        id="linearGradient4169"
    2949        inkscape:collect="always">
    2950       <stop
    2951          id="stop4171"
    2952          offset="0"
    2953          style="stop-color:#b9b9b9;stop-opacity:1" />
    2954       <stop
    2955          id="stop4173"
    2956          offset="1"
    2957          style="stop-color:#7d7d7d;stop-opacity:1" />
    2958     </linearGradient>
    2959     <linearGradient
    2960        y2="7.1072145"
    2961        x2="62.608765"
    2962        y1="-13.444987"
    2963        x1="62.745731"
    2964        gradientTransform="matrix(0.49009663,0,0,0.60135298,-16.515203,1041.636)"
    2965        gradientUnits="userSpaceOnUse"
    2966        id="linearGradient4183"
    2967        xlink:href="#linearGradient5691"
    2968        inkscape:collect="always" />
    2969     <radialGradient
    2970        r="5.1217437"
    2971        fy="1037.7605"
    2972        fx="15.672348"
    2973        cy="1037.7605"
    2974        cx="15.672348"
    2975        gradientTransform="matrix(0.51904533,0.69979869,-0.59045304,0.43794345,620.80171,571.47685)"
    2976        gradientUnits="userSpaceOnUse"
    2977        id="radialGradient4201"
    2978        xlink:href="#linearGradient4189-7"
    2979        inkscape:collect="always" />
    2980     <linearGradient
    2981        id="linearGradient4189-7"
    2982        inkscape:collect="always">
    2983       <stop
    2984          id="stop4191-25"
    2985          offset="0"
    2986          style="stop-color:#c398f5;stop-opacity:1" />
    2987       <stop
    2988          id="stop4193"
    2989          offset="1"
    2990          style="stop-color:#9148d7;stop-opacity:1" />
    2991     </linearGradient>
    2992     <linearGradient
    2993        y2="7.1072145"
    2994        x2="62.608765"
    2995        y1="-13.444987"
    2996        x1="62.745731"
    2997        gradientTransform="matrix(0.49009663,0,0,0.60135298,-12.623066,1041.3252)"
    2998        gradientUnits="userSpaceOnUse"
    2999        id="linearGradient4203"
    3000        xlink:href="#linearGradient5691"
    3001        inkscape:collect="always" />
    3002     <radialGradient
    3003        r="5.1217437"
    3004        fy="1032.0334"
    3005        fx="9.8125"
    3006        cy="1032.0334"
    3007        cx="9.8125"
    3008        gradientTransform="matrix(0.73216672,0.866415,-0.92686097,0.78324773,959.17967,214.71009)"
    3009        gradientUnits="userSpaceOnUse"
    3010        id="radialGradient4161"
    3011        xlink:href="#linearGradient4149"
    3012        inkscape:collect="always" />
    3013     <linearGradient
    3014        id="linearGradient4149"
    3015        inkscape:collect="always">
    3016       <stop
    3017          id="stop4151"
    3018          offset="0"
    3019          style="stop-color:#c5f579;stop-opacity:1" />
    3020       <stop
    3021          id="stop4153"
    3022          offset="1"
    3023          style="stop-color:#75e115;stop-opacity:1" />
    3024     </linearGradient>
    3025     <linearGradient
    3026        y2="7.1072145"
    3027        x2="62.608765"
    3028        y1="-13.444987"
    3029        x1="62.745731"
    3030        gradientTransform="matrix(0.49009663,0,0,0.60135298,-19.087794,1036.3317)"
    3031        gradientUnits="userSpaceOnUse"
    3032        id="linearGradient4163"
    3033        xlink:href="#linearGradient5691"
    3034        inkscape:collect="always" />
    3035     <radialGradient
    3036        r="5.1217442"
    3037        fy="1033.335"
    3038        fx="20.847567"
    3039        cy="1033.335"
    3040        cx="20.847567"
    3041        gradientTransform="matrix(0.74379444,0.3532203,-0.33399891,0.70331994,351.06392,298.98332)"
    3042        gradientUnits="userSpaceOnUse"
    3043        id="radialGradient4297"
    3044        xlink:href="#linearGradient4285-1"
    3045        inkscape:collect="always" />
    3046     <linearGradient
    3047        id="linearGradient4285-1"
    3048        inkscape:collect="always">
    3049       <stop
    3050          id="stop4287"
    3051          offset="0"
    3052          style="stop-color:#f5c88c;stop-opacity:1" />
    3053       <stop
    3054          id="stop4289"
    3055          offset="1"
    3056          style="stop-color:#cd9b55;stop-opacity:1" />
    3057     </linearGradient>
    3058     <linearGradient
    3059        y2="7.1072145"
    3060        x2="62.608765"
    3061        y1="-13.444987"
    3062        x1="62.745731"
    3063        gradientTransform="matrix(0.49009663,0,0,0.60135298,-7.876886,1037.2662)"
    3064        gradientUnits="userSpaceOnUse"
    3065        id="linearGradient4299"
    3066        xlink:href="#linearGradient5691"
    3067        inkscape:collect="always" />
    3068     <radialGradient
    3069        r="5.1217437"
    3070        fy="1036.4016"
    3071        fx="20.682873"
    3072        cy="1036.4016"
    3073        cx="20.682873"
    3074        gradientTransform="matrix(0.55364967,0.55310778,-0.52436711,0.52488085,552.6867,480.6273)"
    3075        gradientUnits="userSpaceOnUse"
    3076        id="radialGradient4221"
    3077        xlink:href="#linearGradient4209"
    3078        inkscape:collect="always" />
    3079     <linearGradient
    3080        id="linearGradient4209"
    3081        inkscape:collect="always">
    3082       <stop
    3083          id="stop4211"
    3084          offset="0"
    3085          style="stop-color:#fff0aa;stop-opacity:1" />
    3086       <stop
    3087          id="stop4213"
    3088          offset="1"
    3089          style="stop-color:#ffc832;stop-opacity:1" />
    3090     </linearGradient>
    3091     <linearGradient
    3092        y2="7.1072145"
    3093        x2="62.608765"
    3094        y1="-13.444987"
    3095        x1="62.745731"
    3096        gradientTransform="matrix(0.49009663,0,0,0.60135298,-8.5253489,1040.0596)"
    3097        gradientUnits="userSpaceOnUse"
    3098        id="linearGradient4223"
    3099        xlink:href="#linearGradient5691"
    3100        inkscape:collect="always" />
    3101     <radialGradient
    3102        r="5.1217437"
    3103        fy="1034.7361"
    3104        fx="16.788858"
    3105        cy="1034.7361"
    3106        cx="16.788858"
    3107        gradientTransform="matrix(0.7130021,0.10767359,-0.15670076,1.0376544,165.70377,-40.277842)"
    3108        gradientUnits="userSpaceOnUse"
    3109        id="radialGradient4277"
    3110        xlink:href="#linearGradient4267"
    3111        inkscape:collect="always" />
    3112     <linearGradient
    3113        inkscape:collect="always"
    3114        id="linearGradient4267">
    3115       <stop
    3116          style="stop-color:#f58ceb;stop-opacity:1"
    3117          offset="0"
    3118          id="stop4269-9" />
    3119       <stop
    3120          style="stop-color:#d150c3;stop-opacity:1"
    3121          offset="1"
    3122          id="stop4271" />
    3123     </linearGradient>
    3124     <linearGradient
    3125        y2="7.1072145"
    3126        x2="62.608765"
    3127        y1="-13.444987"
    3128        x1="62.745731"
    3129        gradientTransform="matrix(0.49009663,0,0,0.60135298,-16.762731,1039.9138)"
    3130        gradientUnits="userSpaceOnUse"
    3131        id="linearGradient4279"
    3132        xlink:href="#linearGradient5691"
    3133        inkscape:collect="always" />
    3134     <radialGradient
    3135        gradientUnits="userSpaceOnUse"
    3136        gradientTransform="matrix(0.57354279,1.0372504,-1.0619522,0.58720185,1077.6114,408.78997)"
    3137        r="5.1217437"
    3138        fy="1011.508"
    3139        fx="8.0625"
    3140        cy="1011.508"
    3141        cx="8.0625"
    3142        id="radialGradient4139"
    3143        xlink:href="#linearGradient4133"
    3144        inkscape:collect="always" />
    3145     <linearGradient
    3146        id="linearGradient4133"
    3147        inkscape:collect="always">
    3148       <stop
    3149          id="stop4135"
    3150          offset="0"
    3151          style="stop-color:#89d7ff;stop-opacity:1" />
    3152       <stop
    3153          id="stop4137"
    3154          offset="1"
    3155          style="stop-color:#2f91f5;stop-opacity:1" />
    3156     </linearGradient>
    3157     <linearGradient
    3158        y2="7.1072145"
    3159        x2="62.608765"
    3160        y1="-13.444987"
    3161        x1="62.745731"
    3162        gradientTransform="matrix(0.49009663,0,0,0.60135298,-21.087794,1015.3942)"
    3163        gradientUnits="userSpaceOnUse"
    3164        id="linearGradient4130"
    3165        xlink:href="#linearGradient5691"
    3166        inkscape:collect="always" />
    3167     <linearGradient
    3168        inkscape:collect="always"
    3169        xlink:href="#linearGradient4485"
    3170        id="linearGradient6218"
    3171        gradientUnits="userSpaceOnUse"
    3172        x1="23.732271"
    3173        y1="1038.3527"
    3174        x2="25.986174"
    3175        y2="1042.7279"
    3176        gradientTransform="matrix(1.2524566,0,0,1.0757768,483.69612,-1078.5769)" />
    3177     <linearGradient
    3178        id="linearGradient4485"
    3179        inkscape:collect="always">
    3180       <stop
    3181          id="stop4487"
    3182          offset="0"
    3183          style="stop-color:#ffb41e;stop-opacity:1" />
    3184       <stop
    3185          id="stop4489"
    3186          offset="1"
    3187          style="stop-color:#e18214;stop-opacity:1" />
    3188     </linearGradient>
    3189     <linearGradient
    3190        inkscape:collect="always"
    3191        xlink:href="#linearGradient5691-976"
    3192        id="linearGradient6215"
    3193        gradientUnits="userSpaceOnUse"
    3194        x1="22.22967"
    3195        y1="1037.9991"
    3196        x2="23.953241"
    3197        y2="1039.4354"
    3198        gradientTransform="matrix(1.2524566,0,0,1.0757768,483.69612,-1078.5769)" />
    3199     <linearGradient
    3200        gradientTransform="matrix(1.2524566,0,0,1.0757768,483.69613,1.892693)"
    3201        gradientUnits="userSpaceOnUse"
    3202        y2="38.586639"
    3203        x2="24.395184"
    3204        y1="37.084038"
    3205        x1="24.262602"
    3206        id="linearGradient4501"
    3207        xlink:href="#linearGradient4495"
    3208        inkscape:collect="always" />
    3209     <linearGradient
    3210        id="linearGradient4495"
    3211        inkscape:collect="always">
    3212       <stop
    3213          id="stop4497"
    3214          offset="0"
    3215          style="stop-color:#b93c0a;stop-opacity:1" />
    3216       <stop
    3217          id="stop4499"
    3218          offset="1"
    3219          style="stop-color:#440701;stop-opacity:1" />
    3220     </linearGradient>
    3221     <linearGradient
    3222        inkscape:collect="always"
    3223        xlink:href="#linearGradient4445"
    3224        id="linearGradient6209"
    3225        gradientUnits="userSpaceOnUse"
    3226        x1="23.576941"
    3227        y1="1046.7808"
    3228        x2="26.264553"
    3229        y2="1046.825"
    3230        gradientTransform="matrix(1.2524566,0,0,1.0757768,483.69612,-1078.5769)" />
    3231     <linearGradient
    3232        id="linearGradient4445"
    3233        inkscape:collect="always">
    3234       <stop
    3235          id="stop4447"
    3236          offset="0"
    3237          style="stop-color:#f4fafa;stop-opacity:1" />
    3238       <stop
    3239          id="stop4449"
    3240          offset="1"
    3241          style="stop-color:#b1f5ff;stop-opacity:1" />
    3242     </linearGradient>
    3243     <linearGradient
    3244        inkscape:collect="always"
    3245        xlink:href="#linearGradient4469"
    3246        id="linearGradient6205"
    3247        gradientUnits="userSpaceOnUse"
    3248        x1="22.578125"
    3249        y1="43.953125"
    3250        x2="26.09375"
    3251        y2="43.984375"
    3252        gradientTransform="matrix(1.2524566,0,0,1.0757768,483.69613,1.892693)" />
    3253     <linearGradient
    3254        id="linearGradient4469"
    3255        inkscape:collect="always">
    3256       <stop
    3257          id="stop4471"
    3258          offset="0"
    3259          style="stop-color:#e12d37;stop-opacity:1;" />
    3260       <stop
    3261          id="stop4473"
    3262          offset="1"
    3263          style="stop-color:#a51923;stop-opacity:1" />
    3264     </linearGradient>
    3265     <linearGradient
    3266        inkscape:collect="always"
    3267        xlink:href="#linearGradient4453"
    3268        id="linearGradient6201"
    3269        gradientUnits="userSpaceOnUse"
    3270        x1="20.984375"
    3271        y1="1045.6278"
    3272        x2="22.34375"
    3273        y2="1045.2997"
    3274        gradientTransform="matrix(1.2524566,0,0,1.0757768,483.69612,-1078.5769)" />
    3275     <linearGradient
    3276        id="linearGradient4453"
    3277        inkscape:collect="always">
    3278       <stop
    3279          id="stop4455"
    3280          offset="0"
    3281          style="stop-color:#f5f5f5;stop-opacity:1;" />
    3282       <stop
    3283          id="stop4457"
    3284          offset="1"
    3285          style="stop-color:#b1f5ff;stop-opacity:1" />
    3286     </linearGradient>
    3287     <linearGradient
    3288        inkscape:collect="always"
    3289        xlink:href="#linearGradient4461"
    3290        id="linearGradient6197"
    3291        gradientUnits="userSpaceOnUse"
    3292        x1="27.09375"
    3293        y1="1047.0966"
    3294        x2="27.59375"
    3295        y2="1046.0497"
    3296        gradientTransform="matrix(1.2524566,0,0,1.0757768,483.69612,-1078.5769)" />
    3297     <linearGradient
    3298        id="linearGradient4461"
    3299        inkscape:collect="always">
    3300       <stop
    3301          id="stop4463"
    3302          offset="0"
    3303          style="stop-color:#f5f5f5;stop-opacity:1;" />
    3304       <stop
    3305          id="stop4465"
    3306          offset="1"
    3307          style="stop-color:#d9ffff;stop-opacity:1" />
    3308     </linearGradient>
    3309     <linearGradient
    3310        inkscape:collect="always"
    3311        xlink:href="#linearGradient4477"
    3312        id="linearGradient6194"
    3313        gradientUnits="userSpaceOnUse"
    3314        x1="22.59375"
    3315        y1="1050.7997"
    3316        x2="26.75"
    3317        y2="1050.7684"
    3318        gradientTransform="matrix(1.2524566,0,0,1.0757768,483.69613,-1078.5769)" />
    3319     <linearGradient
    3320        id="linearGradient4477"
    3321        inkscape:collect="always">
    3322       <stop
    3323          id="stop4479"
    3324          offset="0"
    3325          style="stop-color:#e12d37;stop-opacity:1;" />
    3326       <stop
    3327          id="stop4481"
    3328          offset="1"
    3329          style="stop-color:#7d0f19;stop-opacity:1" />
    3330     </linearGradient>
    33312936  </defs>
    33322937  <sodipodi:namedview
     
    33452950     inkscape:snap-center="true"
    33462951     inkscape:zoom="1.4142136"
    3347      inkscape:cx="247.40348"
     2952     inkscape:cx="233.47448"
    33482953     inkscape:cy="-18.58816"
    33492954     inkscape:window-x="0"
    3350      inkscape:window-y="24"
    3351      inkscape:window-maximized="1"
    3352      inkscape:current-layer="svg2" />
     2955     inkscape:window-y="23"
     2956     inkscape:window-maximized="0"
     2957     inkscape:current-layer="g10411" />
    33532958  <flowRoot
    33542959     xml:space="preserve"
     
    33973002       width="550"
    33983003       id="rect10431"
    3399        style="fill:#5bb9ff;fill-opacity:1;stroke:none" />
     3004       style="fill:#7295a6;fill-opacity:1;stroke:none" />
    34003005    <text
    34013006       inkscape:export-ydpi="90"
     
    34263031         id="tspan5336"
    34273032         sodipodi:role="line">LLIUREX UP</tspan></text>
    3428     <path
    3429        inkscape:connector-curvature="0"
    3430        id="rect2985-2"
    3431        d="m 427.53404,15.789984 c -3.22361,0 -6.02527,1.535336 -7.47858,3.800146 -0.68208,-0.15074 -1.39666,-0.231481 -2.13352,-0.231481 -4.7159,0 -8.53411,3.298851 -8.53411,7.349521 0,1.163146 0.31478,2.244409 0.87587,3.221444 -1.44652,1.09901 -2.52671,2.548847 -3.07677,4.185942 -2.52082,0.770615 -4.63428,2.254007 -6.04125,4.166657 -1.45255,-1.360305 -3.56569,-2.218328 -5.88405,-2.218328 -0.94474,0 -1.83201,0.145185 -2.67252,0.405061 -1.32832,-2.175489 -3.99355,-3.665116 -7.05187,-3.665116 -3.29475,0 -6.11724,1.73228 -7.32137,4.185979 -0.24368,-0.0708 -0.48718,-0.127099 -0.74112,-0.173642 l 0,11.342569 c 1.78363,-0.327284 3.30902,-1.269627 4.26706,-2.546291 1.13072,0.531356 2.41572,0.848763 3.79543,0.848763 0.94353,0 1.85537,-0.145802 2.69498,-0.405061 0.63685,1.043023 1.5725,1.927774 2.71744,2.565551 -0.57674,1.112837 -0.89832,2.34913 -0.89832,3.645856 0,4.95073 4.67919,8.969859 10.44305,8.969859 5.11918,0 9.37483,-3.172894 10.26339,-7.349492 0.13651,0.0062 0.26659,0 0.40424,0 6.28532,0 11.43026,-4.199436 11.83547,-9.510042 2.02401,1.778145 4.84876,2.893513 7.97265,2.893513 1.56034,0 3.03102,-0.274444 4.37935,-0.771604 0.86413,2.301971 3.20767,4.031967 6.0637,4.37888 -0.008,0.123889 0,0.240802 0,0.366481 0,3.544313 3.32972,6.423628 7.45612,6.423628 0.75871,0 1.4885,-0.108827 2.17844,-0.289382 0.31099,2.886662 2.22962,5.370793 4.96326,6.809432 l 90.34926,0 0,-8.87344 c -0.40722,-0.36253 -0.86403,-0.695554 -1.34749,-0.983825 0.021,-0.214136 0.0449,-0.417777 0.0449,-0.636542 0,-1.783576 -0.7163,-3.426042 -1.90895,-4.726101 0.60442,-1.031479 0.9657,-2.200181 0.9657,-3.433635 0,-1.540429 -0.54676,-2.966783 -1.45978,-4.166657 0.76446,-0.996109 1.21274,-2.189872 1.21274,-3.472215 0,-3.488017 -3.28292,-6.307851 -7.34382,-6.307851 -4.06092,0 -7.36629,2.819834 -7.36629,6.307851 0,0.627097 0.11629,1.241479 0.31442,1.813267 -1.64247,1.193887 -2.77761,2.880673 -3.07677,4.803262 -0.4517,-0.06049 -0.89842,-0.09648 -1.36995,-0.09648 -4.45185,0 -8.15124,2.814315 -8.80361,6.481467 -0.97701,-0.237407 -2.01124,-0.36648 -3.07677,-0.36648 -3.18214,0 -6.03614,1.129256 -8.08494,2.951351 -1.17383,-0.587653 -2.54093,-0.925924 -3.99756,-0.925924 -3.40074,0 -6.29977,1.856601 -7.43366,4.436719 -0.51114,-0.0887 -1.0305,-0.15432 -1.57207,-0.15432 -0.44063,0 -0.88147,0.03765 -1.30257,0.09648 -0.85262,-2.980056 -3.99304,-5.189063 -7.72562,-5.189063 -2.61077,0 -4.92966,1.088701 -6.37812,2.758512 -1.21516,-0.647714 -2.6419,-1.022405 -4.17722,-1.022405 -0.40104,0 -0.78276,0.02778 -1.16783,0.07716 -1.42904,-3.487462 -5.31023,-5.979926 -9.85914,-5.979926 -2.05645,0 -3.97613,0.506789 -5.59209,1.388886 -0.947,-2.149008 -3.18044,-3.735918 -5.9065,-4.070177 0.008,-0.121296 0,-0.243518 0,-0.366542 0,-0.955554 -0.23764,-1.866416 -0.67374,-2.681291 1.2294,-1.143824 1.97632,-2.680117 1.97632,-4.359558 0,-3.508388 -3.27514,-6.366276 -7.34383,-6.423622 0,-4.190176 -3.35984,-7.698255 -7.88282,-8.680537 -0.43257,-3.702609 -4.06455,-6.597208 -8.48919,-6.597208 z"
    3432        style="fill:#f5f5f5;fill-opacity:1;stroke:none" />
    3433     <path
    3434        inkscape:connector-curvature="0"
    3435        id="path6259"
    3436        d="m 510.21164,63.974469 0.24955,0 0.95281,-0.993782 0.22687,-1.091214 -0.22687,-0.623548 -1.08893,-0.116913 -0.54447,0.46766 -0.11343,1.169158 z"
    3437        style="fill:#cd733c;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
    3438     <path
    3439        sodipodi:nodetypes="cc"
    3440        inkscape:connector-curvature="0"
    3441        id="path6255"
    3442        d="m 511.18714,57.914344 -0.43103,3.975136"
    3443        style="fill:none;stroke:#000000;stroke-width:0.66604608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
    3444     <path
    3445        inkscape:connector-curvature="0"
    3446        id="path4503"
    3447        d="m 503.51189,22.81716 4.09599,16.16462"
    3448        style="fill:none;stroke:#414141;stroke-width:0.34822801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3449     <path
    3450        sodipodi:nodetypes="cc"
    3451        inkscape:connector-curvature="0"
    3452        id="path4505"
    3453        d="m 494.98223,18.120528 12.73635,20.576006"
    3454        style="fill:none;stroke:#414141;stroke-width:0.34822801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3455     <path
    3456        inkscape:connector-curvature="0"
    3457        id="path4507"
    3458        d="m 511.26107,22.246643 -3.21038,16.259706"
    3459        style="fill:none;stroke:#414141;stroke-width:0.34822801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3460     <path
    3461        sodipodi:nodetypes="cc"
    3462        inkscape:connector-curvature="0"
    3463        id="path4509"
    3464        d="M 519.43406,25.004137 508.27209,38.601472"
    3465        style="fill:none;stroke:#414141;stroke-width:0.34822801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3466     <path
    3467        inkscape:connector-curvature="0"
    3468        id="path4511"
    3469        d="m 516.46408,15.590614 -8.6348,23.201043"
    3470        style="fill:none;stroke:#414141;stroke-width:0.34822801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3471     <path
    3472        inkscape:connector-curvature="0"
    3473        id="path4513"
    3474        d="m 506.94366,13.118372 0.99633,25.007669"
    3475        style="fill:none;stroke:#414141;stroke-width:0.34822801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3476     <path
    3477        sodipodi:nodetypes="ccccc"
    3478        inkscape:connector-curvature="0"
    3479        id="path5074-29"
    3480        d="m 517.97968,44.411706 c -0.0292,0.905554 0.49702,1.332528 1.54955,1.702281 0.84465,0.263703 2.63007,-0.0871 2.87856,-0.798949 0.26713,-0.696665 -0.86192,-1.614441 -1.84281,-1.795614 -0.95049,-0.129505 -1.99903,-0.22253 -2.5853,0.892282 z"
    3481        style="fill:#ec9632;fill-opacity:1;stroke:#b95514;stroke-width:0.34822801;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3482     <path
    3483        sodipodi:nodetypes="ccccc"
    3484        inkscape:connector-curvature="0"
    3485        id="path5074-2-0"
    3486        d="m 518.45984,44.489793 c -0.0228,0.742406 0.70191,0.386419 1.52529,0.689443 0.66075,0.216234 1.74434,0.63506 1.93872,0.05062 0.20897,-0.571172 -0.67426,-1.323454 -1.44158,-1.472034 -0.74356,-0.106481 -1.5638,-0.182407 -2.02243,0.731418 z"
    3487        style="fill:#e18214;stroke:#d76414;stroke-width:0.18590774;stroke-miterlimit:4;stroke-dasharray:none" />
    3488     <path
    3489        sodipodi:nodetypes="ccccc"
    3490        inkscape:connector-curvature="0"
    3491        id="path5074"
    3492        d="m 510.48812,44.65399 c 0.0292,0.905553 -0.49702,1.332528 -1.54955,1.70228 -0.84465,0.263642 -2.63007,-0.08716 -2.87856,-0.79901 -0.26712,-0.696666 0.86192,-1.61438 1.84281,-1.795552 0.95049,-0.129506 1.99903,-0.222592 2.5853,0.892282 z"
    3493        style="fill:#ec9632;fill-opacity:1;stroke:#b95514;stroke-width:0.34822801;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3494     <g
    3495        transform="matrix(1.2524566,0,0,1.0757768,508.66698,-1108.3624)"
    3496        id="g4177">
    3497       <path
    3498          style="fill:url(#radialGradient4181);fill-opacity:1;fill-rule:nonzero;stroke:#414141;stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none"
    3499          d="m 18.764322,1039.6037 c 0,3.2642 -2.156681,5.9104 -4.816669,5.9104 -2.660231,0 -4.8167907,-2.6462 -4.8167907,-5.9104 0,-3.264 2.1565597,-5.9099 4.8167907,-5.9099 2.659988,0 4.816669,2.6459 4.816669,5.9099 l 0,0 z"
    3500          id="path6495-6"
    3501          inkscape:connector-curvature="0" />
    3502       <path
    3503          id="path8655-4"
    3504          d="m 18.255149,1039.5245 c 0,2.9047 -1.919111,5.2595 -4.286086,5.2595 -2.367191,0 -4.2861949,-2.3548 -4.2861949,-5.2595 0,-2.9044 1.9190039,-5.259 4.2861949,-5.259 2.366975,0 4.286086,2.3546 4.286086,5.259 l 0,0 z"
    3505          style="opacity:0.6;fill:none;stroke:url(#linearGradient4183);stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    3506          inkscape:connector-curvature="0" />
    3507     </g>
    3508     <g
    3509        transform="matrix(1.2524566,0,0,1.0757768,494.49856,-1106.4798)"
    3510        id="g4197">
    3511       <path
    3512          style="fill:url(#radialGradient4201);fill-opacity:1;fill-rule:nonzero;stroke:#41167d;stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none"
    3513          d="m 22.656458,1039.2929 c 0,3.2642 -2.156681,5.9104 -4.816668,5.9104 -2.660231,0 -4.816791,-2.6462 -4.816791,-5.9104 0,-3.264 2.15656,-5.9099 4.816791,-5.9099 2.659987,0 4.816668,2.6459 4.816668,5.9099 l 0,0 z"
    3514          id="path6495-3"
    3515          inkscape:connector-curvature="0" />
    3516       <path
    3517          id="path8655-02"
    3518          d="m 22.147285,1039.2137 c 0,2.9047 -1.919111,5.2595 -4.286086,5.2595 -2.367191,0 -4.286195,-2.3548 -4.286195,-5.2595 0,-2.9044 1.919004,-5.259 4.286195,-5.259 2.366975,0 4.286086,2.3546 4.286086,5.259 l 0,0 z"
    3519          style="opacity:0.6;fill:none;stroke:url(#linearGradient4203);stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    3520          inkscape:connector-curvature="0" />
    3521     </g>
    3522     <g
    3523        transform="matrix(1.2524566,0,0,1.0757768,492.77644,-1103.387)"
    3524        id="g4157">
    3525       <path
    3526          style="fill:url(#radialGradient4161);fill-opacity:1;fill-rule:nonzero;stroke:#2f9b04;stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none"
    3527          d="m 16.19173,1034.2994 c 0,3.2642 -2.156681,5.9104 -4.816668,5.9104 -2.660231,0 -4.816791,-2.6462 -4.816791,-5.9104 0,-3.264 2.15656,-5.9099 4.816791,-5.9099 2.659987,0 4.816668,2.6459 4.816668,5.9099 l 0,0 z"
    3528          id="path6495-2"
    3529          inkscape:connector-curvature="0" />
    3530       <path
    3531          id="path8655-9"
    3532          d="m 15.682557,1034.2202 c 0,2.9047 -1.919111,5.2595 -4.286086,5.2595 -2.367191,0 -4.286195,-2.3548 -4.286195,-5.2595 0,-2.9044 1.919004,-5.259 4.286195,-5.259 2.366975,0 4.286086,2.3546 4.286086,5.259 l 0,0 z"
    3533          style="opacity:0.6;fill:none;stroke:url(#linearGradient4163);stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    3534          inkscape:connector-curvature="0" />
    3535     </g>
    3536     <g
    3537        transform="matrix(1.2524566,0,0,1.0757768,491.52398,-1094.9824)"
    3538        id="g4293">
    3539       <path
    3540          style="fill:url(#radialGradient4297);fill-opacity:1;fill-rule:nonzero;stroke:#a06428;stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none"
    3541          d="m 27.402639,1035.2339 c 0,3.2642 -2.156681,5.9104 -4.816669,5.9104 -2.66023,0 -4.816791,-2.6462 -4.816791,-5.9104 0,-3.264 2.156561,-5.9099 4.816791,-5.9099 2.659988,0 4.816669,2.6459 4.816669,5.9099 l 0,0 z"
    3542          id="path6495-4"
    3543          inkscape:connector-curvature="0" />
    3544       <path
    3545          id="path8655-64"
    3546          d="m 26.893466,1035.1547 c 0,2.9047 -1.919111,5.2595 -4.286086,5.2595 -2.367191,0 -4.286195,-2.3548 -4.286195,-5.2595 0,-2.9044 1.919004,-5.259 4.286195,-5.259 2.366975,0 4.286086,2.3546 4.286086,5.259 l 0,0 z"
    3547          style="opacity:0.6;fill:none;stroke:url(#linearGradient4299);stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    3548          inkscape:connector-curvature="0" />
    3549     </g>
    3550     <g
    3551        transform="matrix(1.2524566,0,0,1.0757768,484.58175,-1100.6369)"
    3552        id="g4217">
    3553       <path
    3554          style="fill:url(#radialGradient4221);fill-opacity:1;fill-rule:nonzero;stroke:#e18214;stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none"
    3555          d="m 26.754175,1038.0273 c 0,3.2642 -2.156681,5.9104 -4.816668,5.9104 -2.660231,0 -4.816791,-2.6462 -4.816791,-5.9104 0,-3.264 2.15656,-5.9099 4.816791,-5.9099 2.659987,0 4.816668,2.6459 4.816668,5.9099 l 0,0 z"
    3556          id="path6495-8"
    3557          inkscape:connector-curvature="0" />
    3558       <path
    3559          id="path8655-0"
    3560          d="m 26.245002,1037.9481 c 0,2.9047 -1.919111,5.2595 -4.286085,5.2595 -2.367191,0 -4.286195,-2.3548 -4.286195,-5.2595 0,-2.9044 1.919004,-5.259 4.286195,-5.259 2.366974,0 4.286085,2.3546 4.286085,5.259 l 0,0 z"
    3561          style="opacity:0.6;fill:none;stroke:url(#linearGradient4223);stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    3562          inkscape:connector-curvature="0" />
    3563     </g>
    3564     <g
    3565        transform="matrix(1.2524566,0,0,1.0757768,486.12276,-1100.1596)"
    3566        id="g4273">
    3567       <path
    3568          style="fill:url(#radialGradient4277);fill-opacity:1;fill-rule:nonzero;stroke:#a9329b;stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none"
    3569          d="m 18.516793,1037.8815 c 0,3.2642 -2.156681,5.9104 -4.816668,5.9104 -2.660231,0 -4.8167909,-2.6462 -4.8167909,-5.9104 0,-3.264 2.1565599,-5.9099 4.8167909,-5.9099 2.659987,0 4.816668,2.6459 4.816668,5.9099 l 0,0 z"
    3570          id="path6495-17"
    3571          inkscape:connector-curvature="0" />
    3572       <path
    3573          id="path8655-8"
    3574          d="m 18.00762,1037.8023 c 0,2.9047 -1.919111,5.2595 -4.286086,5.2595 -2.367191,0 -4.2861939,-2.3548 -4.2861939,-5.2595 0,-2.9044 1.9190029,-5.259 4.2861939,-5.259 2.366975,0 4.286086,2.3546 4.286086,5.259 l 0,0 z"
    3575          style="opacity:0.6;fill:none;stroke:url(#linearGradient4279);stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    3576          inkscape:connector-curvature="0" />
    3577     </g>
    3578     <g
    3579        transform="matrix(1.2524566,0,0,1.0757768,483.69613,-1078.5769)"
    3580        id="g4141">
    3581       <path
    3582          style="fill:url(#radialGradient4139);fill-opacity:1;fill-rule:nonzero;stroke:#11419b;stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none"
    3583          d="m 14.19173,1013.3619 c 0,3.2642 -2.156681,5.9104 -4.816668,5.9104 -2.660231,0 -4.816791,-2.6462 -4.816791,-5.9104 0,-3.264 2.15656,-5.9099 4.816791,-5.9099 2.659987,0 4.816668,2.6459 4.816668,5.9099 l 0,0 z"
    3584          id="path6495-93"
    3585          inkscape:connector-curvature="0" />
    3586       <path
    3587          id="path8655-08"
    3588          d="m 13.682557,1013.2827 c 0,2.9047 -1.919111,5.2595 -4.286086,5.2595 -2.367191,0 -4.286195,-2.3548 -4.286195,-5.2595 0,-2.9044 1.919004,-5.259 4.286195,-5.259 2.366975,0 4.286086,2.3546 4.286086,5.259 l 0,0 z"
    3589          style="opacity:0.6;fill:none;stroke:url(#linearGradient4130);stroke-width:0.61002815;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    3590          inkscape:connector-curvature="0" />
    3591     </g>
    3592     <path
    3593        sodipodi:nodetypes="ssscs"
    3594        inkscape:connector-curvature="0"
    3595        id="path4301"
    3596        d="m 518.85254,41.866835 c 0,2.967093 -1.7241,4.312275 -4.60251,4.341719 -2.99555,0.03148 -4.68078,-1.374626 -4.68078,-4.341719 0,-2.967092 2.00171,-4.525175 4.68078,-6.403134 2.60634,1.89228 4.60251,3.436042 4.60251,6.403134 z"
    3597        style="fill:url(#linearGradient6218);fill-opacity:1;stroke:#b95514;stroke-width:0.34822801;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3598     <path
    3599        sodipodi:nodetypes="ssscs"
    3600        inkscape:connector-curvature="0"
    3601        id="path4301-7"
    3602        d="m 518.56571,41.92202 c 0,2.797217 -1.60815,4.065239 -4.29301,4.09314 -2.79411,0.02901 -4.36602,-1.295923 -4.36602,-4.09314 0,-2.797031 1.8671,-4.265793 4.36602,-6.036159 2.43108,1.783823 4.29301,3.239128 4.29301,6.036159 z"
    3603        style="fill:none;stroke:url(#linearGradient6215);stroke-width:0.32653975;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3604     <path
    3605        sodipodi:nodetypes="ccccc"
    3606        inkscape:connector-curvature="0"
    3607        id="path5072"
    3608        d="m 514.31449,35.085677 c 0.39341,-0.257654 0.88844,-0.738208 0.90021,-1.285861 -0.0216,-0.429382 -0.28844,-0.828147 -0.90021,-0.857282 -0.50947,0.01728 -0.92543,0.355616 -0.91977,0.907714 -0.0262,0.46648 0.4282,0.839195 0.91977,1.235429 z"
    3609        style="fill:#732814;stroke:none" />
    3610     <path
    3611        sodipodi:nodetypes="ccccc"
    3612        inkscape:connector-curvature="0"
    3613        id="path5074-2"
    3614        d="m 510.00796,44.732076 c 0.0229,0.742406 -0.70191,0.386419 -1.52529,0.689443 -0.66075,0.216234 -1.74434,0.63506 -1.93872,0.05062 -0.20897,-0.57111 0.67426,-1.323392 1.44159,-1.471972 0.74355,-0.106481 1.5638,-0.182469 2.02242,0.731418 z"
    3615        style="fill:#e18214;stroke:#d76414;stroke-width:0.18590774;stroke-miterlimit:4;stroke-dasharray:none" />
    3616     <ellipse
    3617        id="path4369"
    3618        style="fill:url(#linearGradient4501);fill-opacity:1;stroke:none"
    3619        cx="514.14648"
    3620        cy="42.503265"
    3621        rx="1.174178"
    3622        ry="1.5464292" />
    3623     <path
    3624        sodipodi:nodetypes="ccc"
    3625        inkscape:connector-curvature="0"
    3626        id="path6257"
    3627        d="m 516.63183,58.382006 0.0907,1.247102 -1.81489,2.630599"
    3628        style="fill:none;stroke:#000000;stroke-width:0.66604608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
    3629     <path
    3630        sodipodi:nodetypes="cccccccc"
    3631        inkscape:connector-curvature="0"
    3632        id="path6253"
    3633        d="m 509.68986,52.86749 -0.4991,4.949425 c 1.62012,0.355591 2.74123,0.547547 3.97008,0.233832 l 0.58985,-2.552657 c 0.43657,0.889858 0.45117,1.779716 0.61252,2.669577 1.00127,0.429696 2.30267,0.57477 3.69786,0.272801 L 517.6754,52.96492 Z"
    3634        style="fill:#2f91f5;stroke:#1b5fcd;stroke-width:0.33302304;stroke-miterlimit:4;stroke-dasharray:none" />
    3635     <path
    3636        sodipodi:nodetypes="cccc"
    3637        inkscape:connector-curvature="0"
    3638        id="path4371"
    3639        d="m 509.38249,52.84533 8.64649,0.07105 c 0.21865,-1.930305 -0.36586,-7.24301 -3.73264,-7.226528 -3.81401,-0.105432 -5.15009,5.324742 -4.91385,7.15517 z"
    3640        style="fill:url(#linearGradient6209);fill-opacity:1;stroke:#d7d7d7;stroke-width:0.34822801;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3641     <path
    3642        inkscape:connector-curvature="0"
    3643        id="path4393"
    3644        d="m 509.32099,45.478865 -1.54984,-4.849373 -1.10703,-0.665616 -0.38745,-1.426231 1.49448,-0.618147 1.49449,0.04753 0.2214,1.901724 -0.77492,0.522962 1.54984,5.419988 z"
    3645        style="fill:#000000;stroke:none" />
    3646     <path
    3647        sodipodi:nodetypes="ccccc"
    3648        inkscape:connector-curvature="0"
    3649        id="path4399"
    3650        d="m 510.79058,48.324044 6.26853,0.02346 0.41514,1.557033 -7.34789,-0.05926 z"
    3651        style="fill:url(#linearGradient6205);fill-opacity:1;stroke:none" />
    3652     <path
    3653        sodipodi:nodetypes="cccc"
    3654        inkscape:connector-curvature="0"
    3655        id="path4373"
    3656        d="m 507.80147,45.677568 3.82462,-0.674752 c 0.29475,1.006727 0.51794,2.749809 -0.85371,3.167833 -2.07838,0.258518 -2.60842,-1.579132 -2.97091,-2.493081 z"
    3657        style="fill:url(#linearGradient6201);fill-opacity:1;stroke:#d7d7d7;stroke-width:0.34822801;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3658     <path
    3659        sodipodi:nodetypes="ccccccc"
    3660        inkscape:connector-curvature="0"
    3661        id="path4397"
    3662        d="m 518.69334,48.279106 1.72213,1.546416 2.70061,0.705925 0.17949,-0.448703 -2.48871,-0.660616 -1.68298,-1.546417 z"
    3663        style="fill:#000000;stroke:none" />
    3664     <path
    3665        sodipodi:nodetypes="cccc"
    3666        inkscape:connector-curvature="0"
    3667        id="path4373-8"
    3668        d="m 520.64839,47.141577 -2.81761,2.14907 c -0.81191,-0.719135 -1.97775,-2.083638 -1.06614,-3.001537 1.59186,-1.077467 3.06727,0.238641 3.88375,0.852467 z"
    3669        style="fill:url(#linearGradient6197);fill-opacity:1;stroke:#d7d7d7;stroke-width:0.34834212;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    3670     <path
    3671        sodipodi:nodetypes="ccccc"
    3672        inkscape:connector-curvature="0"
    3673        id="path4399-0"
    3674        d="m 509.82885,51.111075 7.80453,-6.2e-5 0.0277,1.343207 -7.94291,-0.07105 z"
    3675        style="fill:url(#linearGradient6194);fill-opacity:1;stroke:none" />
    3676     <path
    3677        sodipodi:nodetypes="ccccccccccc"
    3678        inkscape:connector-curvature="0"
    3679        id="path4493"
    3680        d="m 523.09791,50.504039 -0.1451,1.513145 0.76698,0.01173 0.0645,-1.279873 1.20382,0.595677 0.23958,-0.809257 -1.14412,-0.255 1.08403,-0.711788 -0.4926,-0.476419 -1.40902,0.974936 z"
    3681        style="fill:#000000;fill-opacity:1;stroke:none" />
    3682     <path
    3683        sodipodi:nodetypes="cccccccc"
    3684        inkscape:connector-curvature="0"
    3685        id="path6263"
    3686        d="m 513.47508,62.452707 0.41708,-0.372024 0.59353,-0.110228 0.93041,0.537369 0.60959,0.730264 0.19249,0.564925 -0.81812,-0.206679 z"
    3687        style="fill:#cd733c;stroke:none" />
    36883033  </g>
    36893034</svg>
  • lliurex-up/trunk/fuentes/lliurex-up-gui/rsrc/lliurex-up.ui

    r2669 r2673  
    1111        <property name="visible">True</property>
    1212        <property name="can_focus">False</property>
    13         <property name="halign">center</property>
    14         <property name="valign">center</property>
     13        <property name="margin_top">140</property>
     14        <property name="margin_bottom">10</property>
    1515        <property name="orientation">vertical</property>
    1616        <child>
     
    1818            <property name="visible">True</property>
    1919            <property name="can_focus">False</property>
    20             <property name="margin_left">30</property>
    21             <property name="margin_right">30</property>
    22             <property name="margin_top">30</property>
    23             <property name="margin_bottom">30</property>
    24             <property name="pixbuf">cached.png</property>
    25           </object>
    26           <packing>
    27             <property name="expand">False</property>
     20            <property name="margin_top">25</property>
     21            <property name="pixbuf">up.png</property>
     22          </object>
     23          <packing>
     24            <property name="expand">True</property>
    2825            <property name="fill">True</property>
    2926            <property name="position">0</property>
     
    3330      <packing>
    3431        <property name="expand">False</property>
    35         <property name="fill">False</property>
     32        <property name="fill">True</property>
    3633        <property name="position">0</property>
    3734      </packing>
     
    4138        <property name="visible">True</property>
    4239        <property name="can_focus">False</property>
    43         <property name="valign">center</property>
    44       </object>
    45       <packing>
    46         <property name="expand">True</property>
     40        <property name="margin_top">10</property>
     41        <property name="margin_bottom">10</property>
     42      </object>
     43      <packing>
     44        <property name="expand">False</property>
    4745        <property name="fill">True</property>
    4846        <property name="position">1</property>
     
    134132          <packing>
    135133            <property name="expand">False</property>
    136             <property name="fill">False</property>
     134            <property name="fill">True</property>
    137135            <property name="position">0</property>
    138136          </packing>
     
    152150    <property name="opacity">0.98039215686274506</property>
    153151    <property name="resizable">False</property>
    154     <property name="window_position">center-on-parent</property>
     152    <property name="window_position">center</property>
    155153    <child>
    156154      <object class="GtkBox" id="box5">
     
    177175            <child>
    178176              <object class="GtkBox" id="main_box">
     177                <property name="width_request">600</property>
     178                <property name="height_request">540</property>
    179179                <property name="visible">True</property>
    180180                <property name="can_focus">False</property>
     
    186186              </object>
    187187              <packing>
    188                 <property name="expand">True</property>
     188                <property name="expand">False</property>
    189189                <property name="fill">True</property>
    190190                <property name="position">0</property>
     
    195195                <property name="visible">True</property>
    196196                <property name="can_focus">False</property>
     197                <property name="margin_top">5</property>
    197198                <property name="margin_bottom">5</property>
    198199                <property name="orientation">vertical</property>
     200                <child>
     201                  <object class="GtkLabel" id="progressbar_label">
     202                    <property name="visible">True</property>
     203                    <property name="can_focus">False</property>
     204                    <property name="margin_bottom">5</property>
     205                    <property name="label" translatable="yes">label</property>
     206                  </object>
     207                  <packing>
     208                    <property name="expand">False</property>
     209                    <property name="fill">True</property>
     210                    <property name="position">0</property>
     211                  </packing>
     212                </child>
    199213                <child>
    200214                  <object class="GtkProgressBar" id="progressbar">
     
    208222                    <property name="expand">False</property>
    209223                    <property name="fill">True</property>
    210                     <property name="position">0</property>
     224                    <property name="position">1</property>
    211225                  </packing>
    212226                </child>
     
    267281              <packing>
    268282                <property name="expand">False</property>
    269                 <property name="fill">True</property>
     283                <property name="fill">False</property>
    270284                <property name="pack_type">end</property>
    271285                <property name="position">2</property>
     
    274288          </object>
    275289          <packing>
    276             <property name="expand">True</property>
     290            <property name="expand">False</property>
    277291            <property name="fill">True</property>
    278292            <property name="position">1</property>
     
    448462      <packing>
    449463        <property name="expand">False</property>
    450         <property name="fill">True</property>
     464        <property name="fill">False</property>
    451465        <property name="position">2</property>
    452466      </packing>
     
    464478        <property name="margin_left">5</property>
    465479        <property name="margin_right">5</property>
    466         <property name="margin_top">15</property>
     480        <property name="margin_top">5</property>
    467481        <property name="margin_bottom">5</property>
    468482        <property name="homogeneous">True</property>
     
    596610      <packing>
    597611        <property name="expand">False</property>
    598         <property name="fill">False</property>
     612        <property name="fill">True</property>
    599613        <property name="position">1</property>
    600614      </packing>
     
    703717            <child>
    704718              <object class="GtkScrolledWindow" id="terminalScrolledWindow">
    705                 <property name="height_request">300</property>
     719                <property name="height_request">310</property>
    706720                <property name="visible">True</property>
    707721                <property name="can_focus">True</property>
     
    723737      <packing>
    724738        <property name="expand">False</property>
    725         <property name="fill">False</property>
     739        <property name="fill">True</property>
    726740        <property name="position">3</property>
    727741      </packing>
Note: See TracChangeset for help on using the changeset viewer.