From 2834485f12a6c7168ec2c365a572a781928cdfdf Mon Sep 17 00:00:00 2001 From: Filippo Bedendo Bordon Date: Thu, 10 Nov 2011 19:15:32 +0100 Subject: [PATCH] Added standard path about usbinstall icons --- Makefile | 8 ++++---- src/gui.py | 30 +++++++++++++++++++++++------- src/img/dialog-question.png | Bin 869 -> 0 bytes src/img/document-open.png | Bin 1352 -> 0 bytes src/img/mamba.png | Bin 2138 -> 0 bytes src/img/view-refresh.png | Bin 1147 -> 0 bytes src/usbinstall.py | 9 ++++----- 7 files changed, 31 insertions(+), 16 deletions(-) delete mode 100644 src/img/dialog-question.png delete mode 100644 src/img/document-open.png delete mode 100644 src/img/mamba.png delete mode 100644 src/img/view-refresh.png diff --git a/Makefile b/Makefile index 1a5034a..0a4875e 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,11 @@ PACKAGE := usbinstall +include VERSION + distdir := $(PACKAGE)-$(VERSION) dist_archive := $(distdir).tar.bz2 -include VERSION - # Directory bindir := /usr/bin datadir := /usr/share @@ -53,10 +53,10 @@ install: install-dirs install-locales $(INSTALL_SCRIPT) src/usbinstall.sh $(DESTDIR)$(mambadir)/usbinstall/usbinstall.sh $(INSTALL_PROGRAM) src/gui.py $(DESTDIR)$(mambadir)/usbinstall/gui.py $(INSTALL_DATA) src/fdisk_template $(DESTDIR)$(mambadir)/usbinstall/fdisk_template - $(INSTALL_DATA) src/img/* $(DESTDIR)$(mambadir)/usbinstall/img/ + $(INSTALL_DATA) src/img/*.png $(DESTDIR)$(mambadir)/usbinstall/img/ # Crea un link in /usr/bin agli eseguibili in $(mambadir)/usbinstall ln -s $(DESTDIR)$(mambadir)/usbinstall/usbinstall.py $(DESTDIR)$(bindir)/usbinstall.py - + ln -s $(DESTDIR)$(mambadir)/usbinstall/usbinstall.sh $(DESTDIR)$(bindir)/usbinstall.sh clean: diff --git a/src/gui.py b/src/gui.py index 25842e4..d52b8f4 100644 --- a/src/gui.py +++ b/src/gui.py @@ -16,9 +16,25 @@ except AttributeError: class Ui_MainWindow(object): def setupUi(self, MainWindow): - # Codice per la finestra + + + # Percorsi delle immagini del form (da scommentare le vars. delle icone che si voglono usare) + #---GNOME--- + img_help = "/usr/share/icons/gnome/24x24/status/dialog-question.png" + img_fOpen = "/usr/share/icons/gnome/32x32/actions/document-open.png" + img_refresh = "/usr/share/icons/gnome/24x24/actions/view-refresh.png" + window_icon = "/usr/share/icons/hicolor/32x32/apps/mamba.png" + + #---KDE--- (***Da testare***) + #img_help = "/opt/kde/share/icons/oxygen/22x22/status/dialog-information.png" + #img_fOpen = "/opt/kde/share/icons/oxygen/32x32/actions/document-open-folder.png" + #img_refresh = "/opt/kde/share/icons/oxygen/22x22/actions/view-refresh.png" + #window_icon = "/usr/share/icons/hicolor/32x32/apps/mamba.png" + + # Codice per la finestra MainWindow.setObjectName(_fromUtf8("MainWindow")) MainWindow.resize(500, 405) + MainWindow.setWindowIcon(QtGui.QIcon(_fromUtf8(window_icon))) MainWindow.setWindowTitle(_fromUtf8("")) self.centralwidget = QtGui.QWidget(MainWindow) self.centralwidget.setObjectName(_fromUtf8("centralwidget")) @@ -58,7 +74,7 @@ class Ui_MainWindow(object): self.b_help.setGeometry(QtCore.QRect(464, 320, 26, 26)) self.b_help.setText(_fromUtf8("")) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(_fromUtf8("img/dialog-question.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap(_fromUtf8(img_help)), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.b_help.setIcon(icon) self.b_help.setIconSize(QtCore.QSize(24, 24)) self.b_help.setFlat(True) @@ -73,7 +89,7 @@ class Ui_MainWindow(object): self.pach1 = QtGui.QLabel(self.centralwidget) self.pach1.setGeometry(QtCore.QRect(430, 320, 32, 27)) self.pach1.setText(_fromUtf8("")) - self.pach1.setPixmap(QtGui.QPixmap(_fromUtf8("img/pach1.png"))) + self.pach1.setPixmap(QtGui.QPixmap(_fromUtf8("/usr/share/openmamba/usbinstall/img/pach1.png"))) self.pach1.setObjectName(_fromUtf8("pach1")) # Bottone sopra la parte della finta casella di testo @@ -81,7 +97,7 @@ class Ui_MainWindow(object): self.b_apri_file.setGeometry(QtCore.QRect(431, 320, 31, 27)) self.b_apri_file.setText(_fromUtf8("")) icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(_fromUtf8("img/document-open.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon1.addPixmap(QtGui.QPixmap(_fromUtf8(img_fOpen)), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.b_apri_file.setIcon(icon1) self.b_apri_file.setFlat(True) self.b_apri_file.setObjectName(_fromUtf8("b_apri_file")) @@ -90,7 +106,7 @@ class Ui_MainWindow(object): self.n_img = QtGui.QLabel(self.centralwidget) self.n_img.setGeometry(QtCore.QRect(289, 200, 211, 121)) self.n_img.setText(_fromUtf8("")) - self.n_img.setPixmap(QtGui.QPixmap(_fromUtf8("img/nuvola.png"))) + self.n_img.setPixmap(QtGui.QPixmap(_fromUtf8("/usr/share/openmamba/usbinstall/img/nuvola.png"))) self.n_img.setObjectName(_fromUtf8("n_img")) self.n_img.hide() @@ -108,7 +124,7 @@ class Ui_MainWindow(object): self.n_chiudi.setGeometry(QtCore.QRect(471, 202, 14, 14)) self.n_chiudi.setText(_fromUtf8("")) icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(_fromUtf8("img/exit.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon1.addPixmap(QtGui.QPixmap(_fromUtf8("/usr/share/openmamba/usbinstall/img/exit.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.n_chiudi.setIcon(icon1) self.n_chiudi.setFlat(True) self.n_chiudi.hide() @@ -118,7 +134,7 @@ class Ui_MainWindow(object): self.b_refresh.setGeometry(QtCore.QRect(435, 320, 26, 26)) self.b_refresh.setText(_fromUtf8("")) icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(_fromUtf8("img/view-refresh.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon2.addPixmap(QtGui.QPixmap(_fromUtf8(img_refresh)), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.b_refresh.setIcon(icon2) self.b_refresh.setIconSize(QtCore.QSize(24, 24)) self.b_refresh.setFlat(True) diff --git a/src/img/dialog-question.png b/src/img/dialog-question.png deleted file mode 100644 index ec8de67e9fc3b978bd89054ce9a71142a4b665e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 869 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbQ|PfpJEFPlzj!OF1ygSYn*ER4-<# zPDH<&f32EdwPtXex_^V3Z;hHywW?>iif5T=+7h$$r6#EhU5Zw_6s>VBTH{f&)}wT- zOW|sl!ZogiYa-kCMt1Cr0;0}+(VhFFyY|O`(1Dol1F_u);(89o^&X4|p+oU~hY~>O zaAN=AqzOloCj!yY6d;;(GW}eQS1w?0ZXP?QNeI|d-*@C&}8kU}KUU8v))uryWS0--0zU08Yb;llUIR0Sc z@dw*ZJ=%5}h#qf014K`@pMA0egr4p=2Sm?yo`1IM{PW!xo*%pZ`uyFu7w){iaQF44 zdvC5je0S@~hr7={-hB>4pYA>Xc<=eA`!9g#^P|^a9>4zb=F^XlUw?i6_Urr4KR*sFT6T9Q}&Od+8SKj;n^2hlHUaI%biQbBt7O>^x%~PS9 zc(^{iGJWeeEsFKW+W8A(*E0S2XYk^7;d*oK4;~fu{WotFsC8{+`lBbqSzoi)cAiD< z$3@Em3v!>T6$o(I&WZn^@AtZ>C;0mNz-O0w^aXf+l>7f&bvS8WzwOy8&St*GaqFjB z{;sj#G;x`wSunpvpkMw)x%1z&>vOj2NG`54y;m_uV|mOw-|JFOH%wC7wt(%vl9y)J zqKdlKn3SFI?5c_JTche?K7TK{IAP%w1<%c$Prn?VAYjqcBiU8>*lEiG>Ei+s7kF%i zLd+IE*SonVugam#Yu9W?4&@m&LI3Am^yNKe$nq-Zt&l^Ih;-mew^Ru&(d#lk(^rU3 h`|{l}iE+cX&%A0$KH^$I{+B_S#naW#Wt~$(69DN&r0M_w diff --git a/src/img/document-open.png b/src/img/document-open.png deleted file mode 100644 index fce8c44c9150fb44922d9475a81b54bf24964c20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1352 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 Q%>V!Z07*qoM6N<$f~IN_pa1{> diff --git a/src/img/view-refresh.png b/src/img/view-refresh.png deleted file mode 100644 index 53a5d14fc99a7f6b963374bc73de2482dea78759..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1147 zcmV->1cdvEP)}{Ik#cLh#LPGxP1j$TWBei zu0o+eyRNgXSSzJaN*OD#N(I{T)4`zYA8gQ4{{IWSzUQPhM$5*<)RR0pU)%S6o^zh_ zzUS*60Qgt&{|mIVHJvoKniOVhV`sC)=x=Iim^YaX&PKC=Ycd&*X|>vYdcF2&yU15L?U76>Fox+L3dAEe9b5smt@bl820yPTR&I0-dUHa{gwiuFA zvbnigI!`Xhc<8m z_E7(I^*@3{CP{f>0@4a`=OVRdfm+nmYy?rc;MC&?7!mU95qI%Dzp#oB{ZnAi-mCe!Rkv-oXsLRAqd=+!-PbckUUJ=Lc^Lc6cMW&~) zCpNK~I)GhxwVPdVFR}VbG~Zd@v7i*^HVEj z*Jz`KCW0`IKmrtuV$*eD6P1EORRbJs2EvQ$nY^2iyaFFy!gSL%k2Sj&@-3zk{soO#ZIkXgHoiJeQGi z`t;{tW(P!KAs9^taQ8dG=l8O$r@@26Q8SI%EN7di9Mha>N2yxX3ZmdeJsbj0h3 zS4mDh_W