[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src GFConfig.py uidrivers/gtk2/UIdri...
|
From: |
James Thompson |
|
Subject: |
gnue/forms/src GFConfig.py uidrivers/gtk2/UIdri... |
|
Date: |
Sun, 27 Apr 2003 11:51:37 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: James Thompson <address@hidden> 03/04/27 11:51:37
Modified files:
forms/src : GFConfig.py
forms/src/uidrivers/gtk2: UIdriver.py
forms/src/uidrivers/qt: UILoginHandler.py
forms/src/uidrivers/wx: ErrorHandler.py UILoginHandler.py
UIWXSplashScreen.py
Log message:
renamed smallPNG setting to loginPNG setting as that's all it's used for
made loginPNG support absolute path to image
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFConfig.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/gtk2/UIdriver.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/UILoginHandler.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/ErrorHandler.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UILoginHandler.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIWXSplashScreen.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnue/forms/src/GFConfig.py
diff -c gnue/forms/src/GFConfig.py:1.22 gnue/forms/src/GFConfig.py:1.23
*** gnue/forms/src/GFConfig.py:1.22 Thu Apr 10 02:12:22 2003
--- gnue/forms/src/GFConfig.py Sun Apr 27 11:51:36 2003
***************
*** 289,298 ****
'Description': 'Location of "Exit" toolbar icon (PNG format)',
'Typecast' : GTypecast.text,
'Default' : 'tb_exit.png' },
! { 'Name' : 'SmallPNG',
'Type' : 'Setting',
! 'Comment' : 'Location of GNUe logo (PNG format)',
! 'Description': 'Location of GNUe logo (PNG format)',
'Typecast' : GTypecast.text,
'Default' : 'gnue.png' },
--- 289,298 ----
'Description': 'Location of "Exit" toolbar icon (PNG format)',
'Typecast' : GTypecast.text,
'Default' : 'tb_exit.png' },
! { 'Name' : 'loginPNG',
'Type' : 'Setting',
! 'Comment' : 'Location of GNUe login logo (PNG format)',
! 'Description': 'Location of GNUe login logo (PNG format)',
'Typecast' : GTypecast.text,
'Default' : 'gnue.png' },
Index: gnue/forms/src/uidrivers/gtk2/UIdriver.py
diff -c gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.22
gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.23
*** gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.22 Sat Mar 8 23:08:50 2003
--- gnue/forms/src/uidrivers/gtk2/UIdriver.py Sun Apr 27 11:51:36 2003
***************
*** 1403,1409 ****
table1.set_row_spacings(4)
table1.set_col_spacings(4)
bmp = gtk.Image()
! bmp.set_from_file(images_dir+gConfig('smallPNG'))
messageField = gtk.Label(str(loginMesg))
# left, right, top, bottom
--- 1403,1414 ----
table1.set_row_spacings(4)
table1.set_col_spacings(4)
bmp = gtk.Image()
! if os.path.isabs(gConfigForms('loginPNG')):
! imageFile = gConfigForms('loginPNG')
! else:
! imageFile = images_dir+gConfigForms('loginPNG')
!
! bmp.set_from_file(imageFile)
messageField = gtk.Label(str(loginMesg))
# left, right, top, bottom
Index: gnue/forms/src/uidrivers/qt/UILoginHandler.py
diff -c gnue/forms/src/uidrivers/qt/UILoginHandler.py:1.4
gnue/forms/src/uidrivers/qt/UILoginHandler.py:1.5
*** gnue/forms/src/uidrivers/qt/UILoginHandler.py:1.4 Sat Mar 8 00:11:22 2003
--- gnue/forms/src/uidrivers/qt/UILoginHandler.py Sun Apr 27 11:51:36 2003
***************
*** 68,74 ****
self.dlg = QDialog(None, _("GNU Enterprise: Login to %s") %
loginData[0], 1)
self.dlg.setCaption ( _("GNU Enterprise: Login to %s") % loginData[0])
! bmp = QPixmap(images_dir+gConfigForms('smallPNG'))
messageField = WrappedStaticText(self.dlg, str(loginMesg), 300)
self.textctrlList = []
--- 68,79 ----
self.dlg = QDialog(None, _("GNU Enterprise: Login to %s") %
loginData[0], 1)
self.dlg.setCaption ( _("GNU Enterprise: Login to %s") % loginData[0])
! if os.path.isabs(gConfigForms('loginPNG')):
! imageFile = gConfigForms('loginPNG')
! else:
! imageFile = images_dir+gConfigForms('loginPNG')
!
! bmp = QPixmap(imageFile)
messageField = WrappedStaticText(self.dlg, str(loginMesg), 300)
self.textctrlList = []
Index: gnue/forms/src/uidrivers/wx/ErrorHandler.py
diff -c gnue/forms/src/uidrivers/wx/ErrorHandler.py:1.3
gnue/forms/src/uidrivers/wx/ErrorHandler.py:1.4
*** gnue/forms/src/uidrivers/wx/ErrorHandler.py:1.3 Tue Apr 15 18:14:06 2003
--- gnue/forms/src/uidrivers/wx/ErrorHandler.py Sun Apr 27 11:51:36 2003
***************
*** 80,86 ****
self.dlg = wxDialog(NULL, -1, _("GNU Enterprise: Login to %s") %
loginData[0])
self.dlg.SetAutoLayout(true)
! bmp = wxImage(images_dir+gConfigForms('smallPNG'),
wxBITMAP_TYPE_PNG).ConvertToBitmap()
messageField = WrappedStaticText(self.dlg, -1, str(loginMesg), 300,
style=wxALIGN_CENTER)
--- 80,91 ----
self.dlg = wxDialog(NULL, -1, _("GNU Enterprise: Login to %s") %
loginData[0])
self.dlg.SetAutoLayout(true)
! if os.path.isabs(gConfigForms('loginPNG')):
! imageFile = gConfigForms('loginPNG')
! else:
! imageFile = images_dir+gConfigForms('loginPNG')
!
! bmp = wxImage(imageFile, wxBITMAP_TYPE_PNG).ConvertToBitmap()
messageField = WrappedStaticText(self.dlg, -1, str(loginMesg), 300,
style=wxALIGN_CENTER)
Index: gnue/forms/src/uidrivers/wx/UILoginHandler.py
diff -c gnue/forms/src/uidrivers/wx/UILoginHandler.py:1.4
gnue/forms/src/uidrivers/wx/UILoginHandler.py:1.5
*** gnue/forms/src/uidrivers/wx/UILoginHandler.py:1.4 Wed Apr 9 13:00:38 2003
--- gnue/forms/src/uidrivers/wx/UILoginHandler.py Sun Apr 27 11:51:36 2003
***************
*** 28,33 ****
--- 28,34 ----
#
import string
+ import os.path
from wxPython.wx import *
***************
*** 73,79 ****
self.dlg = wxDialog(NULL, -1, _("GNU Enterprise: Login to %s") %
loginData[0])
self.dlg.SetAutoLayout(true)
! bmp = wxImage(images_dir+gConfigForms('smallPNG'),
wxBITMAP_TYPE_PNG).ConvertToBitmap()
messageField = WrappedStaticText(self.dlg, -1, str(loginMesg), 300,
style=wxALIGN_CENTER)
--- 74,84 ----
self.dlg = wxDialog(NULL, -1, _("GNU Enterprise: Login to %s") %
loginData[0])
self.dlg.SetAutoLayout(true)
! if os.path.isabs(gConfigForms('loginPNG')):
! imageFile = gConfigForms('loginPNG')
! else:
! imageFile = images_dir+gConfigForms('loginPNG')
! bmp = wxImage(imageFile, wxBITMAP_TYPE_PNG).ConvertToBitmap()
messageField = WrappedStaticText(self.dlg, -1, str(loginMesg), 300,
style=wxALIGN_CENTER)
Index: gnue/forms/src/uidrivers/wx/UIWXSplashScreen.py
diff -c gnue/forms/src/uidrivers/wx/UIWXSplashScreen.py:1.3
gnue/forms/src/uidrivers/wx/UIWXSplashScreen.py:1.4
*** gnue/forms/src/uidrivers/wx/UIWXSplashScreen.py:1.3 Mon Feb 17 02:32:53 2003
--- gnue/forms/src/uidrivers/wx/UIWXSplashScreen.py Sun Apr 27 11:51:36 2003
***************
*** 27,32 ****
--- 27,33 ----
# NOTES:
#
+ import os.path
from wxPython.wx import *
from wxPython.lib.splashscreen import SplashScreen
from gnue.common.apps import GConfig
***************
*** 35,41 ****
class UIWXSplashScreen(SplashScreen):
def __init__(self):
images_dir = GConfig.getInstalledBase('forms_images','common_images') +
'/'
! bitmapFile=images_dir+gConfigForms('splashScreenPNG')
SplashScreen.__init__(self,None,bitmapfile=bitmapFile,
duration = 3000, callback=self.onCloseSplash,
--- 36,45 ----
class UIWXSplashScreen(SplashScreen):
def __init__(self):
images_dir = GConfig.getInstalledBase('forms_images','common_images') +
'/'
! if os.path.isabs(gConfigForms('splashScreenPNG')):
! bitmapFile=gConfigForms('splashScreenPNG')
! else:
! bitmapFile=images_dir+gConfigForms('splashScreenPNG')
SplashScreen.__init__(self,None,bitmapfile=bitmapFile,
duration = 3000, callback=self.onCloseSplash,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms/src GFConfig.py uidrivers/gtk2/UIdri...,
James Thompson <=