From 1e77f0bc1c1add0645740c1b73e5de1a8a4d55d0 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Tue, 29 Jul 2008 08:31:35 +0000
Subject: [PATCH] Merge from V4_1_0_maintainance branch (from tag
 mergeto_BR_QT4_Dev_08Jul08)

---
 resources/Makefile.am        |   1 +
 resources/PYHELLO_small.png  | Bin 0 -> 933 bytes
 src/PYHELLOGUI/PYHELLOGUI.py |  34 +++++++++++++++++++++-------------
 3 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100755 resources/PYHELLO_small.png

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 0602e11..a68f5d2 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -27,6 +27,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 dist_salomeres_DATA = \
 	PYHELLO.png \
+	PYHELLO_small.png \
 	ExecPYHELLO.png \
 	SalomeApp.xml
 
diff --git a/resources/PYHELLO_small.png b/resources/PYHELLO_small.png
new file mode 100755
index 0000000000000000000000000000000000000000..474a537825449f079f68d14de661db882f2466a0
GIT binary patch
literal 933
zcmV;W16urvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru*asa56B@8|j^F?Q12RcO
zK~y-)HIvP2TvZsxf9KqD&z(CnnMr0QlZ=xzWt378vTAi<7ivLN5Et!A*Wxk=?sTae
z!9PGNMXGCY*N9p{2^Jc$C74>Z)o3!APUidL-npO0h0_Oqn-`wvec|O1#@vvAHAeyh
zP;&%e^S=aOfEWmX5Qr3z0W{#ud1SKZp_%zi0x2*9#=r#d6tDy=B>t=>EUBf|UObs>
z#GZE{Q>|Y2j{f~n<+9r<x3C|1{imW}{G7X3f5+19-^|Zk0jkkxv}Ix*cS=j23Skul
z){{U}SV~LB&CR;U9|&6=I{C`imUi=@-#dpfe+aMn#dVd--&6T~H|lzqiL8QM(Lb0p
zsmY9<_|4-By1cZX#z879>nQRDXN^c^2p-r@;S*(Lb3Z3u_(nSQv$~x75s5Nk(g;rm
z_28scPw<p6!G>E~-$RHln4L6@`by`1lFDf-T`b<ANI&jJuO)qXQ7wu6_|L&PbKKRc
zHzm$=2*<%`BaGCGWn<FVOOn~5&X&Fdgz`Jx_av?(g`?Dh*fj(D3F!-E4-E1j&_d&H
z_yo%jYne*zwxtWVfxjNTR=Jh(yTCF~g|u!|s1lv784*jFCWr*=se=h57$l&k?Fa8G
zCws+m@;6mHo2?|X=#mf_OBd~5l2KZVa!UEDd0aUq0>af0oiEwpuzT9A)^{vBvlGuI
zm(w&Esc<@cTPo+C%E&vUCTI@RcsL2$jWeZAx|}pDx#%s`YWIb0H-%;0^*e{p>q6yo
zl`VcLgg6$)+}H%l;bi<Gf%S|@lDaPEt_n-$fNDIMG?FlIol<!lIPg1%Pa{OzE!V#S
zh6)%0+}a&n^2a^@RHOWH>$jtHbMw^DO{V9icG|H&c|pyxo|SQ%Ze{H=uYGV9=mNfY
z>(y5fiv^rw0Ui0QxjD*tmmp_z@uiK??%uF)X5BHr?zP0jlsC7wUf!N}Ap#=x(fS5g
z+Yh<rcX@qvg=beEL)aEk)kZk7Q0mNRtY?Ke8S!nif2G$OQ7RQQkN`%S@r2m(>78^q
zFBMj=&&`7abS7YSx5H7ZP4fNk9NuryYIV7G?HlIX6CnK$%jk2U{E08R00000NkvXX
Hu0mjfX(hO6

literal 0
HcmV?d00001

diff --git a/src/PYHELLOGUI/PYHELLOGUI.py b/src/PYHELLOGUI/PYHELLOGUI.py
index 5a877b5..43536b5 100644
--- a/src/PYHELLOGUI/PYHELLOGUI.py
+++ b/src/PYHELLOGUI/PYHELLOGUI.py
@@ -45,7 +45,7 @@ class GUIcontext:
     # module name
     MODULE_NAME      = "PYHELLO"
     # module icon
-    MODULE_PIXMAP    = "PYHELLO.png"
+    MODULE_PIXMAP    = "PYHELLO_small.png"
     # data objects IDs
     MODULE_ID        = 1000
     OBJECT_ID        = 1010
@@ -350,13 +350,13 @@ def createPopupMenu( popup, context ):
         # one object is selected
         if GUIcontext.MODULE_ID in selected:
             # menu for component
-            sgPyQt.action( GUIcontext.DELETE_ALL_ID ).addTo( popup )
+            popup.addAction( sgPyQt.action( GUIcontext.DELETE_ALL_ID ) )
         elif GUIcontext.OBJECT_ID in selected:
             # menu for object
-            sgPyQt.action( GUIcontext.SHOW_ME_ID ).addTo( popup )
-            sgPyQt.action( GUIcontext.RENAME_ME_ID ).addTo( popup )
-            popup.insertSeparator()
-            sgPyQt.action( GUIcontext.DELETE_ME_ID ).addTo( popup )
+            popup.addAction( sgPyQt.action( GUIcontext.SHOW_ME_ID ) )
+            popup.addAction( sgPyQt.action( GUIcontext.RENAME_ME_ID ) )
+            popup.addSeparator()
+            popup.addAction( sgPyQt.action( GUIcontext.DELETE_ME_ID ) )
             pass
         pass
     elif selcount > 1:
@@ -364,10 +364,10 @@ def createPopupMenu( popup, context ):
         if len( selected ) == 1:
             if GUIcontext.MODULE_ID in selected:
                 # menu for component
-                sgPyQt.action( GUIcontext.DELETE_ALL_ID ).addTo( popup )
+                popup.addAction( sgPyQt.action( GUIcontext.DELETE_ALL_ID ) )
             elif GUIcontext.OBJECT_ID in selected:
                 # menu for list of objects
-                sgPyQt.action( GUIcontext.DELETE_ME_ID ).addTo( popup )
+                popup.addAction( sgPyQt.action( GUIcontext.DELETE_ME_ID ) )
                 pass
             pass
         pass
@@ -474,13 +474,17 @@ def ShowHELLO():
 # Create new object
 ###
 def CreateObject():
-    default_name = str( sgPyQt.stringSetting( "PYHELLO", "def_obj_name", GUIcontext.DEFAULT_NAME ).stripWhiteSpace() )
+    default_name = str( sgPyQt.stringSetting( "PYHELLO", "def_obj_name", GUIcontext.DEFAULT_NAME ).trimmed() )
     try:
         if sgPyQt.action( GUIcontext.OPTION_3_ID ).isOn():
             # request object name from the user
-            name, ok = QInputDialog.getText( "Create Object", "Enter object name:", QLineEdit.Normal, default_name )
+            name, ok = QInputDialog.getText( sgPyQt.getDesktop(),
+                                             "Create Object",
+                                             "Enter object name:",
+                                             QLineEdit.Normal,
+                                             default_name )
             if not ok: return
-            name = str( name.stripWhiteSpace() )
+            name = str( name.trimmed() )
         elif sgPyQt.action( GUIcontext.OPTION_2_ID ).isOn():
             # generate object name
             global __id__
@@ -572,8 +576,12 @@ def Rename():
     if entry != '':
         sobj = study.FindObjectID( entry )
         if ( sobj ):
-            name, ok = QInputDialog.getText( "Object name", "Enter object name:", QLineEdit.Normal, sobj.GetName() )
-            name = str( name.stripWhiteSpace() )
+            name, ok = QInputDialog.getText( sgPyQt.getDesktop(),
+                                             "Object name",
+                                             "Enter object name:",
+                                             QLineEdit.Normal,
+                                             sobj.GetName() )
+            name = str( name.trimmed() )
             if not ok or not name: return
             attr = builder.FindOrCreateAttribute( sobj, "AttributeName" )
             attr.SetValue( name )
-- 
2.30.2