Changeset 2311
- Timestamp:
- Aug 1, 2016, 10:37:34 AM (4 years ago)
- Location:
- zero-lliurex-flavours/trunk/fuentes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
zero-lliurex-flavours/trunk/fuentes/install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py
r2145 r2311 43 43 self.info["installed"]=False 44 44 self.info["checked"]=False 45 self.info["incompatible"]=False 45 46 self.info["shadow_alpha"]=0.1 46 47 self.info["animation_active"]=False … … 129 130 self.configuration_start=0 130 131 131 self.first_run=True132 self.update_alternatives=False133 134 132 self.current_grid_width=0 135 133 self.current_grid_height=0 … … 142 140 self.green=CustomColor(74.0,166.,69.0) 143 141 self.light_green=CustomColor(88.0,208.0,86.0) 144 145 142 146 143 self.conf_light=CustomColor(49.0,55.0,66.0) … … 258 255 else: 259 256 if gb.info["installed"]==True: 257 self.check_meta_blocked(gb, self.gbs) 260 258 self.flavours_installed+=1 261 259 self.add_grid_button(gb) 262 263 264 265 260 266 261 #def gather_info 267 262 263 def check_meta_blocked(self, gb, gbs): 264 265 if gb.info["pkg"]=="lliurex-meta-server": 266 for gb in self.gbs: 267 if gb.info["pkg"]=="lliurex-meta-client": 268 gb.info["incompatible"]=True 269 elif gb.info["pkg"]=="lliurex-meta-desktop" and not gb.info["installed"]: 270 gb.info["incompatible"]=True 271 elif gb.info["pkg"]=="lliurex-meta-client": 272 for gb in self.gbs: 273 if gb.info["pkg"]=="lliurex-meta-server": 274 gb.info["incompatible"]=True 275 276 #def check_meta_blocked 277 268 278 def pulsate_gathering_info(self): 269 279 … … 317 327 } 318 328 329 #DIALOG_LABEL{ 330 color: #8297a1; 331 font: Noto Sans Bold 10; 332 } 333 319 334 #MAIN_LABEL_DISABLED{ 320 335 color: #c9d4e2; … … 474 489 def button_clicked(self,widget,event,grid_button): 475 490 476 if not grid_button.info["installed"]:491 if not (grid_button.info["installed"] or grid_button.info["incompatible"]): 477 492 if grid_button.info["checked"]: 478 493 self.install_metas.remove(grid_button) 479 494 grid_button.info["checked"]=False 495 grid_button.info["drawingarea"].queue_draw() 496 self.mouse_left(grid_button.info["drawingarea"],None,grid_button) 480 497 else: 481 498 self.install_metas.append(grid_button) … … 489 506 490 507 def accept_clicked(self,widget,even=None): 508 491 509 ret, msg=self.check_meta_compatibility() 492 510 … … 495 513 self.msg_label.set_markup(msg) 496 514 return 497 498 self.msg_label.hide() 515 else: 516 self.msg_label.hide() 517 self.show_confirm_dialog(widget) 518 519 # def accept_clicked 520 521 def show_confirm_dialog(self, widget): 522 message=_("The selected flavours will be installed. Do you wish to continue?") 523 label = Gtk.Label(message) 524 525 dialog = Gtk.Dialog("Warning", None, Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT, (Gtk.STOCK_YES, Gtk.ResponseType.YES, Gtk.STOCK_NO, Gtk.ResponseType.NO)) 526 dialog.vbox.pack_start(label,True,True,10) 527 528 label.show() 529 #dialog.set_border_width(6) 530 dialog.set_name("BACK_GRADIENT") 531 label.set_name("DIALOG_LABEL") 532 533 response = dialog.run() 534 535 if response==Gtk.ResponseType.YES: 536 self.install_packages(widget) 537 dialog.destroy() 538 539 # def show_confirm_dialog 540 541 def install_packages(self,widget): 542 543 499 544 cmd='apt-get update && apt-get install -y ' 500 545 pkg="" … … 504 549 for item in self.install_metas: 505 550 pkg+=item.info["pkg"] + ' ' 506 551 507 552 command=cmd+pkg 553 508 554 self.t=threading.Thread(target=self.execute,args=(command,)) 509 555 self.t.daemon=True 510 556 self.t.start() 511 557 GLib.timeout_add(100,self.pulsate_pbar,widget) 512 self.progress_window.show() 513 514 515 # def accept_clicked558 self.progress_window.show() 559 560 561 # def install_packages 516 562 517 563 def check_meta_compatibility(self): … … 623 669 ctx.fill() 624 670 671 672 if grid_button.info["incompatible"]: 673 674 desc = Pango.font_description_from_string ("Noto Sans Bold 7") 675 pctx.set_font_description(desc) 676 ctx.set_source_rgba(255,0,0,1) 677 txt=_("Incompatible") 678 pctx.set_markup(txt) 679 width=pctx.get_pixel_size()[0] 680 ctx.move_to(140-width-5,120) 681 PangoCairo.show_layout(ctx, pctx) 682 683 ctx.rectangle(5,139,130,1) 684 ctx.fill() 625 685 #def draw_button 626 686 … … 828 888 # def log 829 889 890 891 830 892 #awesome tabs 831 893 -
zero-lliurex-flavours/trunk/fuentes/lliurex-po/zero-lliurex-flavours/ca_ES@valencia.po
r2145 r2311 9 9 "Project-Id-Version: \n" 10 10 "Report-Msgid-Bugs-To: \n" 11 "POT-Creation-Date: 2016-0 7-11 09:55+0200\n"12 "PO-Revision-Date: 2016-0 7-13 09:10+0200\n"11 "POT-Creation-Date: 2016-08-01 09:58+0200\n" 12 "PO-Revision-Date: 2016-08-01 10:01+0200\n" 13 13 "Last-Translator: Pilar Embid Giner <embid_mar@gva.es>\n" 14 14 "Language-Team: LliureX\n" … … 20 20 "X-Generator: Poedit 1.8.7.1\n" 21 21 22 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:2 7722 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:288 23 23 msgid "No flavour detected. Check one at least" 24 24 msgstr "No s'ha seleccionat cap sabor. Seleccioneu-ne un, com a mínim" 25 25 26 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:4 3226 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:451 27 27 msgid "Installation succesful. A reboot is required" 28 28 msgstr "La instal·lació és correcta. Cal que reinicieu" 29 29 30 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:4 3530 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:454 31 31 msgid "An error ocurred. See log in /tmp/lliurex-flavours-selector" 32 32 msgstr "S'ha produït un error. Reviseu el registre en /tmp/lliurex-flavours-selector" 33 33 34 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:525 35 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:533 36 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:553 34 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:522 35 msgid "The selected flavours will be installed. Do you wish to continue?" 36 msgstr "Els sabors seleccionats seran instal·lats. Desitgeu continuar?" 37 38 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:576 39 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:584 40 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:604 37 41 msgid "Incompatibility between Server and Client detected" 38 msgstr "S'ha detectat una incompatibilitat entre servidor i client e"42 msgstr "S'ha detectat una incompatibilitat entre servidor i client" 39 43 40 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:5 2844 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:579 41 45 msgid "Is not possible adding Desktop Flavour in Server" 42 46 msgstr "No es pot incorporar el sabor Escriptori al servidor" 43 47 44 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py: 55848 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:609 45 49 msgid "Choose new flavour to incorporate or close button" 46 50 msgstr "Seleccioneu un sabor nou per a incorporar-lo o polseu Tanca" 47 51 48 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py: 59752 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:648 49 53 msgid "Installed" 50 54 msgstr "Instal·lat" 51 55 52 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:6 1156 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:662 53 57 msgid "Install" 54 58 msgstr "Instal·la" 55 59 56 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:647 60 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:677 61 msgid "Incompatible" 62 msgstr "Incompat" 63 64 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:712 57 65 msgid "APPLY" 58 66 msgstr "APLICAR" 59 67 60 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:7 0468 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:769 61 69 msgid "CLOSE" 62 70 msgstr "TANCA" -
zero-lliurex-flavours/trunk/fuentes/lliurex-po/zero-lliurex-flavours/es.po
r2143 r2311 7 7 msgid "" 8 8 msgstr "" 9 "Project-Id-Version: \n"9 "Project-Id-Version: PACKAGE VERSION\n" 10 10 "Report-Msgid-Bugs-To: \n" 11 "POT-Creation-Date: 2016-0 7-11 09:55+0200\n"12 "PO-Revision-Date: 2016-0 7-11 10:02+0200\n"11 "POT-Creation-Date: 2016-08-01 09:58+0200\n" 12 "PO-Revision-Date: 2016-08-01 10:01+0200\n" 13 13 "Last-Translator: lliurex <juapesai@hotmail.com>\n" 14 14 "Language-Team: Spanish\n" … … 18 18 "Content-Transfer-Encoding: 8bit\n" 19 19 "Plural-Forms: nplurals=2; plural=(n != 1);\n" 20 "X-Generator: Poedit 1.8.7.1\n"21 20 22 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:2 7721 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:288 23 22 msgid "No flavour detected. Check one at least" 24 23 msgstr "Ningún sabor detectado. Seleccione al menos uno" 25 24 26 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:4 3225 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:451 27 26 msgid "Installation succesful. A reboot is required" 28 27 msgstr "Instalación correcta. Es necesario reiniciar" 29 28 30 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:4 3529 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:454 31 30 msgid "An error ocurred. See log in /tmp/lliurex-flavours-selector" 32 31 msgstr "A ocurrido un error. Revise el log en /tmp/lliurex-flavours-selector" 33 32 34 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:525 35 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:533 36 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:553 33 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:522 34 msgid "The selected flavours will be installed. Do you wish to continue?" 35 msgstr "Los sabores seleccionados serán instalados. ¿Desea continuar?" 36 37 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:576 38 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:584 39 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:604 37 40 msgid "Incompatibility between Server and Client detected" 38 41 msgstr "Detectada incompatibilidad entre Servidor y Cliente" 39 42 40 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:5 2843 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:579 41 44 msgid "Is not possible adding Desktop Flavour in Server" 42 45 msgstr "No es posible incorporar el sabor Desktop en el Servidor" 43 46 44 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py: 55847 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:609 45 48 msgid "Choose new flavour to incorporate or close button" 46 49 msgstr "Seleccione un nuevo sabor a incorporar o pulse cerrar" 47 50 48 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py: 59751 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:648 49 52 msgid "Installed" 50 53 msgstr "Instalado" 51 54 52 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:6 1155 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:662 53 56 msgid "Install" 54 57 msgstr "Instalar" 55 58 56 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:647 59 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:677 60 msgid "Incompatible" 61 msgstr "Incompat" 62 63 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:712 57 64 msgid "APPLY" 58 65 msgstr "APLICAR" 59 66 60 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:7 0467 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:769 61 68 msgid "CLOSE" 62 69 msgstr "CERRAR" -
zero-lliurex-flavours/trunk/fuentes/lliurex-po/zero-lliurex-flavours/zero-lliurex-flavours.pot
r2143 r2311 9 9 "Project-Id-Version: PACKAGE VERSION\n" 10 10 "Report-Msgid-Bugs-To: \n" 11 "POT-Creation-Date: 2016-0 7-11 09:55+0200\n"11 "POT-Creation-Date: 2016-08-01 09:58+0200\n" 12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 18 18 "Content-Transfer-Encoding: 8bit\n" 19 19 20 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:2 7720 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:288 21 21 msgid "No flavour detected. Check one at least" 22 22 msgstr "" 23 23 24 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:4 3224 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:451 25 25 msgid "Installation succesful. A reboot is required" 26 26 msgstr "" 27 27 28 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:4 3528 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:454 29 29 msgid "An error ocurred. See log in /tmp/lliurex-flavours-selector" 30 30 msgstr "" 31 31 32 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:525 33 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:533 34 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:553 32 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:522 33 msgid "The selected flavours will be installed. Do you wish to continue?" 34 msgstr "" 35 36 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:576 37 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:584 38 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:604 35 39 msgid "Incompatibility between Server and Client detected" 36 40 msgstr "" 37 41 38 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:5 2842 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:579 39 43 msgid "Is not possible adding Desktop Flavour in Server" 40 44 msgstr "" 41 45 42 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py: 55846 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:609 43 47 msgid "Choose new flavour to incorporate or close button" 44 48 msgstr "" 45 49 46 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py: 59750 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:648 47 51 msgid "Installed" 48 52 msgstr "" 49 53 50 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:6 1154 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:662 51 55 msgid "Install" 52 56 msgstr "" 53 57 54 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:647 58 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:677 59 msgid "Incompatible" 60 msgstr "" 61 62 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:712 55 63 msgid "APPLY" 56 64 msgstr "" 57 65 58 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:7 0466 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:769 59 67 msgid "CLOSE" 60 68 msgstr ""
Note: See TracChangeset
for help on using the changeset viewer.